Skip to content

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.

Changes in structure (#256)

Krzysztof Pajakec6bc9a8f2a4
diff --git a/GrandNode.sln b/GrandNode.sln
index 6b57baf40..f99d8613d 100644
--- a/GrandNode.sln
+++ b/GrandNode.sln
@@ -114,6 +114,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{B7D07028
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Data.Tests", "src\Tests\Grand.Data.Tests\Grand.Data.Tests.csproj", "{ACCAAA38-FBF0-4C18-9227-4A7A3897C5AC}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Business.Core", "src\Business\Grand.Business.Core\Grand.Business.Core.csproj", "{1C0C8328-3B03-4D43-8309-7F0F52A0475F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -295,6 +297,10 @@ Global
{ACCAAA38-FBF0-4C18-9227-4A7A3897C5AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ACCAAA38-FBF0-4C18-9227-4A7A3897C5AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ACCAAA38-FBF0-4C18-9227-4A7A3897C5AC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1C0C8328-3B03-4D43-8309-7F0F52A0475F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1C0C8328-3B03-4D43-8309-7F0F52A0475F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1C0C8328-3B03-4D43-8309-7F0F52A0475F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1C0C8328-3B03-4D43-8309-7F0F52A0475F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -343,6 +349,7 @@ Global
{3CCCC424-B13F-479B-94A2-A0A6B05C0858} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
{B34CA673-578B-46D8-BEC0-2C32BF6997F9} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
{ACCAAA38-FBF0-4C18-9227-4A7A3897C5AC} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8}
+ {1C0C8328-3B03-4D43-8309-7F0F52A0475F} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
index e15969c50..d3f794333 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddBrandCommandHandler.cs
@@ -1,10 +1,10 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
index ecd844615..be012baf9 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCategoryCommandHandler.cs
@@ -1,10 +1,10 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
index 7cb279711..5f6fa8514 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddCollectionCommandHandler.cs
@@ -1,10 +1,10 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
index 3d0018f03..1e5acc7dc 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeCommandHandler.cs
@@ -1,9 +1,9 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
index 036604641..268828bc1 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductAttributeMappingCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
index 03bc6b501..3cfdea96d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCategoryCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Domain.Catalog;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
index 0347de5c0..82336000d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCollectionCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Domain.Catalog;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
index ddef1e539..7255d4e3d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductCommandHandler.cs
@@ -1,12 +1,12 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
using Grand.Domain.Seo;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
using MediatR;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
using Grand.Infrastructure;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index 0a08e8328..099ab370d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
index 05efcb8ab..c8565f919 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductSpecificationCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
index 774f78dad..59ed53f71 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductTierPriceCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
index 9ac105308..9d823d18b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddSpecificationAttributeCommandHandler.cs
@@ -1,9 +1,9 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
index fd2f53abd..9251a1327 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteBrandCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
index 71a2aaa10..256fb849b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCategoryCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
index 5fe5fafcf..83b13eb23 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteCollectionCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
index 07e2a46f7..de944e25c 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.Commands.Models.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
index 0b93d2ea6..ac9efcd9d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductAttributeMappingCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
index 44a47f511..ff51cc14b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCategoryCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
index 2ce088697..b18f9b853 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCollectionCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
index 2c77ac283..1cb1c7d3c 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
index 1c6dfd7ce..21c5a045c 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductPictureCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
index 71b52015f..6412beaf3 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductSpecificationCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
index fefeccaa2..54ce701d5 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteProductTierPriceCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
index aebacad10..bd1154acd 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/DeleteSpecificationAttributeCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.Commands.Models.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
index 485d8f4e9..ca4dbf7de 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateBrandCommandHandler.cs
@@ -1,11 +1,11 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
index c1538141f..76c82267f 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCategoryCommandHandler.cs
@@ -1,11 +1,11 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
index ece6b325a..a758b311a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateCollectionCommandHandler.cs
@@ -1,11 +1,11 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
index de67ee6c9..221ceac7e 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeCommandHandler.cs
@@ -1,9 +1,9 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
index f3e4d5883..d4d806d3b 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductAttributeMappingCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
index 111797122..0d1a25830 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCategoryCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
index 4100a88ac..06d23c4ec 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCollectionCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
index c7415254d..93c02fc36 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductCommandHandler.cs
@@ -1,11 +1,11 @@
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Events.Models;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Events.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Catalog;
using Grand.Domain.Seo;
using Grand.Infrastructure;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index c7507312b..f3dd8c584 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
index 5655190c7..c54728433 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductSpecificationCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
index 92486437b..c8cc4b0aa 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductStockCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
index 85dec84aa..2aec83fcb 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductTierPriceCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
index aa8f736ab..05264fc0a 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateSpecificationAttributeCommandHandler.cs
@@ -1,9 +1,9 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
index e7fbe630a..6ea9ba4bd 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/AddPictureCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.Commands.Models.Common;
using Grand.Api.DTOs.Common;
using Grand.Api.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using MediatR;
namespace Grand.Api.Commands.Handlers.Common
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
index e6f2d5b40..b061a2a01 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/DeletePictureCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Api.Commands.Models.Common;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using MediatR;
namespace Grand.Api.Commands.Handlers.Common
diff --git a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
index 2560e9af0..8744233ab 100644
--- a/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Common/UpdatePictureCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using MediatR;
namespace Grand.Api.Commands.Models.Catalog
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
index 8b16fff6a..57f32f524 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerAddressCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
namespace Grand.Api.Commands.Handlers.Customers
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
index e6985eb9a..86eb3f787 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerCommandHandler.cs
@@ -1,10 +1,10 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
index 6bce2f6b1..c9a3ad29d 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/AddCustomerGroupCommandHandler.cs
@@ -1,8 +1,8 @@
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
index d03794583..700641df3 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerAddressCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Api.Commands.Models.Customers;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
namespace Grand.Api.Commands.Handlers.Customers
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
index c6d7e6c49..1df443a72 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.Commands.Models.Customers;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
index 351fc13dc..4b2a908ed 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/DeleteCustomerGroupCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
index d5c0fb110..2b07becb2 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerAddressCommandHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
namespace Grand.Api.Commands.Handlers.Customers
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
index 2312f4a91..4af527b92 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerCommandHandler.cs
@@ -1,10 +1,10 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
index c38d0b66e..9c4e381de 100644
--- a/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Customers/UpdateCustomerGroupCommandHandler.cs
@@ -1,8 +1,8 @@
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/API/Grand.Api/Controllers/OData/BrandController.cs b/src/API/Grand.Api/Controllers/OData/BrandController.cs
index d3810a2ec..1cf61e7aa 100644
--- a/src/API/Grand.Api/Controllers/OData/BrandController.cs
+++ b/src/API/Grand.Api/Controllers/OData/BrandController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
index 6cda313b6..b7c5e8459 100644
--- a/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/BrandLayoutController.cs
@@ -1,6 +1,6 @@
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/CategoryController.cs b/src/API/Grand.Api/Controllers/OData/CategoryController.cs
index fcc2de902..93a0fe125 100644
--- a/src/API/Grand.Api/Controllers/OData/CategoryController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CategoryController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
index 3983858b8..f40e95d51 100644
--- a/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CategoryLayoutController.cs
@@ -1,6 +1,6 @@
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/CollectionController.cs b/src/API/Grand.Api/Controllers/OData/CollectionController.cs
index e9fa54cb7..6134ef66f 100644
--- a/src/API/Grand.Api/Controllers/OData/CollectionController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CollectionController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
index 7974275c7..82bc073a7 100644
--- a/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CollectionLayoutController.cs
@@ -1,6 +1,6 @@
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/CountryController.cs b/src/API/Grand.Api/Controllers/OData/CountryController.cs
index 9a03f5957..0b0757e78 100644
--- a/src/API/Grand.Api/Controllers/OData/CountryController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CountryController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Common;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs b/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
index 648bb7b2f..084d93247 100644
--- a/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CurrencyController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Common;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/CustomerController.cs b/src/API/Grand.Api/Controllers/OData/CustomerController.cs
index 3c436e55d..1d1433a72 100644
--- a/src/API/Grand.Api/Controllers/OData/CustomerController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CustomerController.cs
@@ -1,10 +1,10 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Api.DTOs.Customers;
using Grand.Api.Queries.Models.Customers;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using MediatR;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
index ae45e8f83..b649b905a 100644
--- a/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
+++ b/src/API/Grand.Api/Controllers/OData/CustomerGroupController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Customers;
using Grand.Api.DTOs.Customers;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
index 50e4cecab..fd8061dce 100644
--- a/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
+++ b/src/API/Grand.Api/Controllers/OData/DeliveryDateController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Shipping;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/LanguageController.cs b/src/API/Grand.Api/Controllers/OData/LanguageController.cs
index 26c6629b7..7bc721f03 100644
--- a/src/API/Grand.Api/Controllers/OData/LanguageController.cs
+++ b/src/API/Grand.Api/Controllers/OData/LanguageController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Common;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs b/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
index a0d0697e2..8d24afe94 100644
--- a/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
+++ b/src/API/Grand.Api/Controllers/OData/PickupPointController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Shipping;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/PictureController.cs b/src/API/Grand.Api/Controllers/OData/PictureController.cs
index a228c85f7..96c5f66fb 100644
--- a/src/API/Grand.Api/Controllers/OData/PictureController.cs
+++ b/src/API/Grand.Api/Controllers/OData/PictureController.cs
@@ -2,8 +2,8 @@
using Grand.Api.Commands.Models.Common;
using Grand.Api.DTOs.Common;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
diff --git a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
index e741797c7..a643fc466 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ProductAttributeController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/ProductController.cs b/src/API/Grand.Api/Controllers/OData/ProductController.cs
index 33e71c558..556886447 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ProductController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
index b2223bfec..a85739c5f 100644
--- a/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ProductLayoutController.cs
@@ -1,6 +1,6 @@
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
index 084a22491..5ce1a5275 100644
--- a/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
+++ b/src/API/Grand.Api/Controllers/OData/ShippingMethodController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Shipping;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
index beeac80f2..a8124a730 100644
--- a/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
+++ b/src/API/Grand.Api/Controllers/OData/SpecificationAttributeController.cs
@@ -1,8 +1,8 @@
using Grand.Api.Commands.Models.Catalog;
using Grand.Api.DTOs.Catalog;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/OData/StoreController.cs b/src/API/Grand.Api/Controllers/OData/StoreController.cs
index b869c6ebb..96d0e13e7 100644
--- a/src/API/Grand.Api/Controllers/OData/StoreController.cs
+++ b/src/API/Grand.Api/Controllers/OData/StoreController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Common;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/VendorController.cs b/src/API/Grand.Api/Controllers/OData/VendorController.cs
index efdbb96be..6918bbbcb 100644
--- a/src/API/Grand.Api/Controllers/OData/VendorController.cs
+++ b/src/API/Grand.Api/Controllers/OData/VendorController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Customers;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs b/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
index e88deb2b2..7ef6a36dd 100644
--- a/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
+++ b/src/API/Grand.Api/Controllers/OData/WarehouseController.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Shipping;
using Grand.Api.Queries.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.OData.Query;
diff --git a/src/API/Grand.Api/Controllers/TokenController.cs b/src/API/Grand.Api/Controllers/TokenController.cs
index cf391c696..79c9d5616 100644
--- a/src/API/Grand.Api/Controllers/TokenController.cs
+++ b/src/API/Grand.Api/Controllers/TokenController.cs
@@ -1,6 +1,6 @@
using Grand.Api.Commands.Models.Common;
using Grand.Api.Models.Common;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/API/Grand.Api/Controllers/TokenWebController.cs b/src/API/Grand.Api/Controllers/TokenWebController.cs
index 054ba8a4e..448287722 100644
--- a/src/API/Grand.Api/Controllers/TokenWebController.cs
+++ b/src/API/Grand.Api/Controllers/TokenWebController.cs
@@ -1,9 +1,9 @@
using Grand.Api.Commands.Models.Common;
using Grand.Api.DTOs;
using Grand.Api.Models.Common;
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
diff --git a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
index 8c9c65e14..7ccce6646 100644
--- a/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
+++ b/src/API/Grand.Api/Filters/AuthorizeApiAdminAttribute.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Data;
using Grand.Domain.Security;
using Microsoft.AspNetCore.Authentication.JwtBearer;
diff --git a/src/API/Grand.Api/Grand.Api.csproj b/src/API/Grand.Api/Grand.Api.csproj
index e2530c483..2468aadc2 100644
--- a/src/API/Grand.Api/Grand.Api.csproj
+++ b/src/API/Grand.Api/Grand.Api.csproj
@@ -1,12 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\Build\Grand.Common.props" />
<ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.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.Storage\Grand.Business.Storage.csproj" />
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />
+ <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>
diff --git a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs b/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
index 0c259f1c0..c5fc87f5e 100644
--- a/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
+++ b/src/API/Grand.Api/Infrastructure/ApiAuthenticationRegistrar.cs
@@ -1,5 +1,5 @@
using Grand.Api.Infrastructure.Extensions;
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.JwtBearer;
diff --git a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs b/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
index 109c32351..5f529de0b 100644
--- a/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
+++ b/src/API/Grand.Api/Queries/Handlers/Customers/GetCustomerQueryHandler.cs
@@ -1,7 +1,7 @@
using Grand.Api.DTOs.Customers;
using Grand.Api.Extensions;
using Grand.Api.Queries.Models.Customers;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
namespace Grand.Api.Queries.Handlers.Customers
diff --git a/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs b/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
index 9f4698dbe..268c7bee8 100644
--- a/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/BrandValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs b/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
index babc6580b..6573e8aaf 100644
--- a/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/CategoryValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs b/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
index 0bb79f2b0..891d1df74 100644
--- a/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/CollectionValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
index ed944cd3f..6f1ff1c19 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductAttributeMappingValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
index d169fb29a..07d3abebd 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductAttributeValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
index 4aa37fc7f..ad210ac25 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductCategoryValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
index ef7799e1f..24f98b005 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductCollectionValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
index e3dada732..113ad6ef3 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductPictureValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
index f43d1f681..d4837b366 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductSpecificationAttributeValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
index 7f472bde8..cd1f6f4d9 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductTierPriceValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs b/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
index aa1d2c831..833a8d171 100644
--- a/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/ProductValidator.cs
@@ -1,9 +1,9 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
diff --git a/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs b/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
index a9dabb843..67f3026cf 100644
--- a/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
+++ b/src/API/Grand.Api/Validators/Catalog/SpecificationAttributeValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Catalog
diff --git a/src/API/Grand.Api/Validators/Common/LoginValidator.cs b/src/API/Grand.Api/Validators/Common/LoginValidator.cs
index af5b63c04..bb146e2c1 100644
--- a/src/API/Grand.Api/Validators/Common/LoginValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/LoginValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.Models.Common;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
diff --git a/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs b/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
index ae3e3e0ad..0b99bcaf2 100644
--- a/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/LoginWebValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Api.Models.Common;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Validators;
diff --git a/src/API/Grand.Api/Validators/Common/PictureValidator.cs b/src/API/Grand.Api/Validators/Common/PictureValidator.cs
index 77759dd53..bbc103c57 100644
--- a/src/API/Grand.Api/Validators/Common/PictureValidator.cs
+++ b/src/API/Grand.Api/Validators/Common/PictureValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
namespace Grand.Api.Validators.Common
{
diff --git a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs b/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
index 19f512e2d..a39fdf1d3 100644
--- a/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/AddressValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Customers;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
diff --git a/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs b/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
index 3d4445b38..af1549fae 100644
--- a/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/CustomerGroupValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Api.DTOs.Customers;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
namespace Grand.Api.Validators.Customers
diff --git a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs b/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
index 6f6651aa9..345395909 100644
--- a/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/CustomerValidator.cs
@@ -1,9 +1,9 @@
using FluentValidation;
using Grand.Api.DTOs.Customers;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
diff --git a/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs b/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
index 5687c899e..462325d8c 100644
--- a/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
+++ b/src/API/Grand.Api/Validators/Customers/PasswordValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Api.DTOs.Customers;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
diff --git a/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj b/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj
index dd8fec09c..2ac20c3e9 100644
--- a/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj
+++ b/src/Business/Grand.Business.Authentication/Grand.Business.Authentication.csproj
@@ -4,7 +4,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.Business.Customers\Grand.Business.Customers.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs
index 1277af682..531ee55f0 100644
--- a/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/ApiAuthenticationService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Authentication;
diff --git a/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
index 917ce71c0..58f9934d4 100644
--- a/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/CookieAuthenticationService.cs
@@ -1,8 +1,7 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Authentication.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure.Configuration;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -10,6 +9,7 @@ using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
using System.Security.Claims;
+using Grand.Business.Core.Utilities.Authentication;
namespace Grand.Business.Authentication.Services
{
@@ -103,8 +103,7 @@ namespace Grand.Business.Authentication.Services
var userPrincipal = new ClaimsPrincipal(userIdentity);
//set value that indicates whether the session is persisted and the time at which the authentication was issued
- var authenticationProperties = new AuthenticationProperties
- {
+ var authenticationProperties = new AuthenticationProperties {
IsPersistent = isPersistent,
IssuedUtc = DateTime.UtcNow,
ExpiresUtc = DateTime.UtcNow.AddHours(CommonHelper.CookieAuthExpires)
@@ -216,11 +215,10 @@ namespace Grand.Business.Authentication.Services
//If provided guid is empty (only remove cookies)
if (customerGuid == Guid.Empty)
- return Task.CompletedTask;
+ return Task.CompletedTask;
//set new cookie value
- var options = new CookieOptions
- {
+ var options = new CookieOptions {
HttpOnly = true,
Expires = cookieExpiresDate
};
diff --git a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
index f4f61546b..b761f041e 100644
--- a/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/ExternalAuthenticationService.cs
@@ -1,20 +1,19 @@
-using Grand.Business.Authentication.Events;
-using Grand.Business.Authentication.Extensions;
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Authentication.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Events;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Data;
-using Grand.Domain.Localization;
using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.AspNetCore.Mvc;
+using Grand.Business.Core.Utilities.Authentication;
+using Grand.Business.Core.Commands.Customers;
namespace Grand.Business.Authentication.Services
{
@@ -141,7 +140,7 @@ namespace Grand.Business.Authentication.Services
return Error(registrationResult.Errors);
//allow to save other customer values by consuming this event
- await _mediator.Publish(new RegisteredByExternalMethodEventHandler(_workContext.CurrentCustomer, parameters, registrationResult));
+ await _mediator.Publish(new RegisteredByExternalMethod(_workContext.CurrentCustomer, parameters, registrationResult));
//raise vustomer registered event
await _mediator.Publish(new CustomerRegisteredEvent(_workContext.CurrentCustomer));
@@ -290,8 +289,7 @@ namespace Grand.Business.Authentication.Services
if (customer == null)
throw new ArgumentNullException(nameof(customer));
- var externalAuthenticationRecord = new ExternalAuthentication
- {
+ var externalAuthenticationRecord = new ExternalAuthentication {
CustomerId = customer.Id,
Email = parameters.Email,
ExternalIdentifier = parameters.Identifier,
@@ -314,9 +312,9 @@ namespace Grand.Business.Authentication.Services
throw new ArgumentNullException(nameof(parameters));
var associationRecord = (from q in _externalAuthenticationRecordRepository.Table
- where q.ExternalIdentifier.ToLowerInvariant() == parameters.Identifier
- && q.ProviderSystemName.ToLowerInvariant() == parameters.ProviderSystemName.ToLowerInvariant()
- select q).FirstOrDefault();
+ where q.ExternalIdentifier.ToLowerInvariant() == parameters.Identifier
+ && q.ProviderSystemName.ToLowerInvariant() == parameters.ProviderSystemName.ToLowerInvariant()
+ select q).FirstOrDefault();
if (associationRecord == null)
return null;
diff --git a/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs
index 00093248a..6d0419372 100644
--- a/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/JwtBearerAuthenticationService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Customers;
using Microsoft.AspNetCore.Authentication.JwtBearer;
namespace Grand.Business.Authentication.Services
diff --git a/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
index 23ed4bdd2..f094207b4 100644
--- a/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/JwtBearerCustomerAuthenticationService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Microsoft.AspNetCore.Authentication.JwtBearer;
diff --git a/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs b/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs
index da374e335..26a321e81 100644
--- a/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/RefreshTokenService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Customers;
using Grand.Domain.Security;
using Grand.Infrastructure.Configuration;
diff --git a/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs b/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs
index 46bc73426..4732c9a51 100644
--- a/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs
+++ b/src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs
@@ -1,12 +1,12 @@
using Google.Authenticator;
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Authentication.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
+using Grand.Business.Core.Utilities.Authentication;
namespace Grand.Business.Authentication.Services
{
diff --git a/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs b/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs
index 5dde9c4e7..172f6e9c0 100644
--- a/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Authentication/Startup/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Business.Authentication.Services;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
diff --git a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/UpdateIntervalPropertiesCommandHandler.cs
similarity index 96%
rename from src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs
rename to src/Business/Grand.Business.Catalog/Commands/UpdateIntervalPropertiesCommandHandler.cs
index b0e7ad991..4c2bb863d 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Commands/UpdateIntervalPropertiesCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Commands.Models;
+using Grand.Business.Core.Commands.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs
similarity index 96%
rename from src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs
rename to src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs
index 32ea2bc02..d55915c94 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Commands/UpdateProductReviewTotalsCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
index cfecc473e..2d257f84b 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductDeletedEventHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Events;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
index 6a4ad2153..4a52cb421 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductPublishEventHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Events.Models;
+using Grand.Business.Core.Events.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using MediatR;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
index b314e09df..18d271b72 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/ProductUnPublishEventHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Events.Models;
+using Grand.Business.Core.Events.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using MediatR;
diff --git a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
index 78bec0596..f73a58310 100644
--- a/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Events.Models;
+using Grand.Business.Core.Events.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
diff --git a/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj b/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj
index 8e3d5d5c6..81b96989c 100644
--- a/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj
+++ b/src/Business/Grand.Business.Catalog/Grand.Business.Catalog.csproj
@@ -4,8 +4,9 @@
<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.Business.Common\Grand.Business.Common.csproj" />
- <ProjectReference Include="..\Grand.Business.Storage\Grand.Business.Storage.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
-
+ <ItemGroup>
+ <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
+ </ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
index 320384b70..96d140e4a 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPersonalizedProductsQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
index 502ba1f6c..7d0525b66 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetPriceByCustomerProductQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
index 6489c9d06..40d1deff4 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetProductArchByIdQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
index 82213cc03..5e540b0b3 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetRecommendedProductsQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
index eb1a8f9ed..ae7c219d4 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSearchProductsQueryHandler.cs
@@ -1,4 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
index 767d5ab3c..e44cba994 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetSuggestedProductsQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
index 9db797bb6..8e9b604aa 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Catalog/Queries/Handlers/GetVendorByIdQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Data;
using Grand.Domain.Vendors;
using MediatR;
diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
index 4a1639403..2440dc122 100644
--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandLayoutService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
index b942c98a7..d4a3c1b07 100644
--- a/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Brands/BrandService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
index f69d712d6..5aa60676a 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryLayoutService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
index fc7632516..add3504ae 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
index 9f4766761..acefb102f 100644
--- a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
index e5e3f1d03..70330b2bd 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionLayoutService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
index 1603761f4..8e970e5f6 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/CollectionService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
index 917cdde08..8118b9681 100644
--- a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/GeoLookupService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/GeoLookupService.cs
index fdec25c16..3cac9cd22 100644
--- a/src/Business/Grand.Business.Catalog/Services/Directory/GeoLookupService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Directory/GeoLookupService.cs
@@ -1,8 +1,8 @@
//This product contains GeoLite2 data created by MaxMind, from http://www.maxmind.com
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.SharedKernel.Extensions;
using MaxMind.GeoIP2;
using MaxMind.GeoIP2.Exceptions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs
index 7ea725a68..6d45234de 100644
--- a/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Directory/MeasureService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Data;
using Grand.Domain.Directory;
using Grand.SharedKernel;
using MediatR;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Business.Catalog.Services.Directory
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs b/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs
index a88937258..4786a9ab6 100644
--- a/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Directory/SearchTermService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
index 01f4393ef..60bb23edf 100644
--- a/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Discounts/DiscountService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs b/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs
index 32425d5d2..bf99eefe6 100644
--- a/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Prices/PriceFormatter.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Domain.Localization;
diff --git a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
index f6ee5a1eb..ecf53fb87 100644
--- a/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Prices/PricingService.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Models;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
@@ -15,7 +15,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Discounts;
using Grand.Domain.Orders;
using MediatR;
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
namespace Grand.Business.Catalog.Services.Prices
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
index ff4ab69d4..3d7eba016 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/AuctionService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
index ab87a7ffe..a7a325d00 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CopyProductService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Seo;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
index 479f52147..ec4600020 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/CustomerGroupProductService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
index abec2355b..c38a8e726 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/InventoryManageService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Events.Models;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Events.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
index 6e570ae89..5f8698821 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/OutOfStockSubscriptionService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
index eeb6347e3..1de494506 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeFormatter.cs
@@ -1,17 +1,16 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.SharedKernel.Extensions;
using System.Net;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
namespace Grand.Business.Catalog.Services.Products
{
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs
index 069fc1a65..6f2ba809a 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeParser.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.SharedKernel.Extensions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
index f0bc87774..987ab59f5 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs
index e2b0bde40..071b735c7 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductCourseService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Domain.Courses;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
index ce410f7ca..18316734a 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductLayoutService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
index bad619291..276d5206a 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReservationService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
index 4e45aea40..402b719cd 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductReviewService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
index 397d21ffa..650853562 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Events.Models;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Events.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Catalog.Queries.Models;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Queries.Catalog;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
index b16a40513..8c33c0ffe 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductTagService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs b/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs
index 5be5db1e7..4398a04c4 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/RecentlyViewedProductsService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
index e1a361d49..a499f1047 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/SpecificationAttributeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs b/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs
index dd8a9bc1b..924bd4308 100644
--- a/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Products/StockQuantityService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
index 21ea729bd..af4313ab2 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/TaxCategoryService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs
index e6b3d2b7f..a6b734488 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/TaxService.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs b/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs
index 97f6d6bfe..ab53f5046 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs
+++ b/src/Business/Grand.Business.Catalog/Services/Tax/VatService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain.Tax;
using System.Text.RegularExpressions;
diff --git a/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs b/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs
index 6d2677d1a..96d20ea3c 100644
--- a/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Business.Catalog.Services.Categories;
using Grand.Business.Catalog.Services.Discounts;
using Grand.Business.Catalog.Services.Collections;
@@ -16,9 +16,9 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Grand.Business.Catalog.Services.Brands;
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Business.Catalog.Services.Directory;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Business.Catalog.Startup
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
index 0ac97cd45..35661e530 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ActivatedValueForPurchasedVouchersCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
index 2eac9de62..369596f4d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AddRequiredProductsCommandHandler.cs
@@ -1,11 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Checkout.Services.Orders;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using MediatR;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
index f05e6fa39..797f21943 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/AwardLoyaltyPointsCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
index 7b88bc767..94d129a7c 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CalculateLoyaltyPointsCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
index 7530f8561..061cb16b1 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Events.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Events.Checkout.Orders;
using Grand.Domain.Orders;
using MediatR;
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
index 1151fcf66..590135187 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CancelOrderItemCommandHandler.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
@@ -53,8 +53,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
}
//add a note
- await _orderService.InsertOrderNote(new OrderNote
- {
+ await _orderService.InsertOrderNote(new OrderNote {
Note = $"Order item has been canceled - {product.Name} - Qty: {request.OrderItem.OpenQty}",
DisplayToCustomer = false,
CreatedOnUtc = DateTime.UtcNow,
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
index 8c4dc3117..d9303c1fa 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CaptureCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Logging;
using Grand.Domain.Payments;
using Grand.SharedKernel;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
index cc42bf782..fc0d1b705 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/CheckOrderStatusCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
index 0b512c719..a10aa094e 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
index d025b52db..86a27c99c 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/DeleteOrderItemCommandHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
@@ -47,9 +47,9 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
if (product == null)
return (true, "Product not exists.");
- if (request.OrderItem.OpenQty == 0
- || request.OrderItem.Status == OrderItemStatus.Close
- || request.OrderItem.OpenQty!= request.OrderItem.Quantity
+ if (request.OrderItem.OpenQty == 0
+ || request.OrderItem.Status == OrderItemStatus.Close
+ || request.OrderItem.OpenQty != request.OrderItem.Quantity
)
{
return (true, "You can't delete this order item.");
@@ -75,8 +75,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
}
//add a note
- await _orderService.InsertOrderNote(new OrderNote
- {
+ await _orderService.InsertOrderNote(new OrderNote {
Note = $"Order item has been deleted - {product.Name}",
DisplayToCustomer = false,
CreatedOnUtc = DateTime.UtcNow,
@@ -94,7 +93,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
request.Order.OrderSubtotalInclTax -= request.OrderItem.PriceInclTax;
request.Order.OrderTax -= (request.OrderItem.PriceInclTax - request.OrderItem.PriceExclTax);
request.Order.OrderTotal -= request.OrderItem.PriceInclTax;
-
+
if (request.Order.ShippingStatusId == ShippingStatus.PartiallyShipped)
{
if (!request.Order.HasItemsToAddToShipment() && !shipments.Where(x => x.DeliveryDateUtc == null).Any())
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
index 659ccb2c2..42c5247f8 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/InsertOrderItemCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
index f55f8a002..d4eff6458 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsAuthorizedCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
index e8af1153e..83ef00b3f 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MarkAsPaidCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
index e1a7ef277..98ce3667b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/MaxOrderNumberCommandHandler.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Data;
using Grand.Domain.Orders;
-using Grand.Business.Checkout.Commands.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
using MediatR;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
index fc32daa7b..19abf22d1 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/OrderStatusCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Pdf;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
index 23e1016a6..301b5d060 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyPaidOfflineCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
index 595f32a0c..24e7b7017 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundCommandHandler.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Domain.Logging;
using Grand.SharedKernel;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
index efd9835c9..91bde6622 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PartiallyRefundOfflineCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
index 1baf3c3dd..259514637 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PlaceOrderCommandHandler.cs
@@ -1,26 +1,25 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Pdf;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -394,8 +393,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
protected virtual async Task<PlaceOrderContainter> PreparePlaceOrderDetails()
{
- var details = new PlaceOrderContainter
- {
+ var details = new PlaceOrderContainter {
//customer
Customer = _workContext.CurrentCustomer
};
@@ -614,8 +612,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
//tax rates
foreach (var kvp in taxRates)
{
- details.Taxes.Add(new OrderTax()
- {
+ details.Taxes.Add(new OrderTax() {
Percent = Math.Round(kvp.Key, 2),
Amount = kvp.Value
});
@@ -697,8 +694,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
Math.Round((commissionRate.Value * scSubTotal / 100), 2) : 0;
//save order item
- var orderItem = new OrderItem
- {
+ var orderItem = new OrderItem {
OrderItemGuid = Guid.NewGuid(),
ProductId = sc.ProductId,
Sku = product.FormatSku(sc.Attributes, _productAttributeParser),
@@ -777,8 +773,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
if (product.OverGiftAmount.HasValue)
amount = await _currencyService.ConvertFromPrimaryStoreCurrency(product.OverGiftAmount.Value, details.Currency);
- var gc = new GiftVoucher
- {
+ var gc = new GiftVoucher {
GiftVoucherTypeId = product.GiftVoucherTypeId,
PurchasedWithOrderItem = orderItem,
Amount = amount,
@@ -895,8 +890,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
await _auctionService.UpdateAuctionEnded(product, true, true);
await _auctionService.UpdateHighestBid(product, product.Price, order.CustomerId);
await _messageProviderService.SendAuctionEndedBinCustomerMessage(product, order.CustomerId, order.CustomerLanguageId, order.StoreId);
- await _auctionService.InsertBid(new Bid()
- {
+ await _auctionService.InsertBid(new Bid() {
CustomerId = order.CustomerId,
OrderId = order.Id,
Amount = product.Price,
@@ -929,8 +923,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
foreach (var discount in details.AppliedDiscounts)
{
- var duh = new DiscountUsageHistory
- {
+ var duh = new DiscountUsageHistory {
DiscountId = discount.DiscountId,
CouponCode = discount.CouponCode,
OrderId = order.Id,
@@ -946,8 +939,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
foreach (var agc in details.AppliedGiftVouchers)
{
double amountUsed = agc.AmountCanBeUsed;
- var gcuh = new GiftVoucherUsageHistory
- {
+ var gcuh = new GiftVoucherUsageHistory {
GiftVoucherId = agc.GiftVoucher.Id,
UsedWithOrderId = order.Id,
UsedValue = amountUsed,
@@ -976,8 +968,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
paymentStatus = PaymentStatus.PartiallyPaid;
- var order = new Order
- {
+ var order = new Order {
StoreId = paymentTransaction.StoreId,
OrderGuid = paymentTransaction.OrderGuid,
Code = paymentTransaction.OrderCode,
@@ -1130,8 +1121,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
if (originalCustomerIfImpersonated != null)
{
//this order is placed by a store administrator impersonating a customer
- await orderService.InsertOrderNote(new OrderNote
- {
+ await orderService.InsertOrderNote(new OrderNote {
Note = string.Format("Order placed by a store owner ('{0}'. ID = {1}) impersonating the customer.",
originalCustomerIfImpersonated.Email, originalCustomerIfImpersonated.Id),
DisplayToCustomer = false,
@@ -1141,8 +1131,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
}
else
{
- await orderService.InsertOrderNote(new OrderNote
- {
+ await orderService.InsertOrderNote(new OrderNote {
Note = "Order placed",
DisplayToCustomer = false,
CreatedOnUtc = DateTime.UtcNow,
@@ -1153,7 +1142,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
//send email notifications
await messageProviderService.SendOrderPlacedStoreOwnerMessage(order, customer, languageSettings.DefaultAdminLanguageId);
-
+
string orderPlacedAttachmentFilePath = string.Empty, orderPlacedAttachmentFileName = string.Empty;
var orderPlacedAttachments = new List<string>();
@@ -1179,7 +1168,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
var vendors = await mediator.Send(new GetVendorsInOrderQuery() { Order = order });
foreach (var vendor in vendors)
{
- await messageProviderService.SendOrderPlacedVendorMessage(order, customer, vendor, languageSettings.DefaultAdminLanguageId);
+ await messageProviderService.SendOrderPlacedVendorMessage(order, customer, vendor, languageSettings.DefaultAdminLanguageId);
}
}
}
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
index a0bca1744..d9b32cb4d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Orders;
-using Grand.Business.Checkout.Commands.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
using MediatR;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
index e063bb073..604529c97 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ProcessOrderPaidCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Interfaces.Pdf;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
index f72c3b1ad..995d531a1 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReOrderCommandHandler.cs
@@ -1,12 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
using MediatR;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
index 8dcc94df4..95a465865 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReduceLoyaltyPointsCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using MediatR;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
index 7c77aa865..5bfc08955 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Domain.Logging;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
index 045df23b2..28461869d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/RefundOfflineCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Domain.Payments;
using Grand.SharedKernel;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
index 3a154123a..5f197ecad 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ReturnBackRedeemedLoyaltyPointsCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
using MediatR;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
index 4c549187a..f1342f91d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/UpdateOrderItemCommandHandler.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Orders
{
@@ -44,7 +44,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
request.Order.OrderSubtotalExclTax += (request.OrderItem.PriceExclTax - originalOrderItem.PriceExclTax);
request.Order.OrderSubtotalInclTax += (request.OrderItem.PriceInclTax - originalOrderItem.PriceInclTax);
- request.Order.OrderTax +=
+ request.Order.OrderTax +=
((request.OrderItem.PriceInclTax - request.OrderItem.PriceExclTax)
- (originalOrderItem.PriceInclTax - originalOrderItem.PriceExclTax));
request.Order.OrderTotal += (request.OrderItem.PriceInclTax - originalOrderItem.PriceInclTax);
@@ -75,8 +75,7 @@ namespace Grand.Business.Checkout.Commands.Handlers.Orders
await _mediator.Send(new CheckOrderStatusCommand() { Order = request.Order });
//add a note
- await _orderService.InsertOrderNote(new OrderNote
- {
+ await _orderService.InsertOrderNote(new OrderNote {
Note = "Order item has been edited",
DisplayToCustomer = false,
CreatedOnUtc = DateTime.UtcNow,
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
index a1d346ab4..1446100ce 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs
index 0006f6dfe..4fd12bd1e 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateShoppingCartTotalAmountCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
index a51c02653..d592fcbca 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Logging;
using Grand.SharedKernel;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
index 0faf227a0..05d0a26eb 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/VoidOfflineCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
index b06232d7e..b9062886b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/DeliveryCommandHandler.cs
@@ -1,12 +1,13 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Commands.Models.Shipping;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Commands.Checkout.Shipping;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
index 3094cba1b..ece822f39 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Commands/Handlers/Shipping/ShipCommandHandler.cs
@@ -1,12 +1,13 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Commands.Models.Shipping;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Commands.Checkout.Shipping;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Checkout.Commands.Handlers.Shipping
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PlaceOrderCommand.cs b/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PlaceOrderCommand.cs
deleted file mode 100644
index 3a15ee217..000000000
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PlaceOrderCommand.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Grand.Business.Checkout.Utilities;
-using MediatR;
-
-namespace Grand.Business.Checkout.Commands.Models.Orders
-{
- public class PlaceOrderCommand : IRequest<PlaceOrderResult>
- {
-
- }
-}
diff --git a/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
index 52503ba51..070b1516c 100644
--- a/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Customers/CustomerRegisteredEventHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Events;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Events.Customers;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
index 90d5bb1f8..ac1de9b2a 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnDeletedEventHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
index 507aa8e74..7de819127 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/MerchandiseReturnInsertEventHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Infrastructure.Events;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
index 956ffac80..4a6010836 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEventHandler.cs
@@ -1,4 +1,5 @@
-using Grand.Domain.Catalog;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
index 66144e5b6..e0958a65e 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEventHandler.cs
@@ -1,5 +1,6 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
index 9e103383e..a98b5a44d 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeletedEventHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
index 834b76c0e..8f63987c3 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentInsertedEventHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure.Events;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
index 8bc1d61c6..1ba2ec6a9 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Events/ShoppingCart/CustomerLoggedInEventHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Customers.Events;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Events.Customers;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
index b7a7bc989..ca47c6a9c 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/OrderEventPublisherExtensions.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
index 61bc16e2b..cd0d7b34b 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/ShippingEventPublisherExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Events.Shipping;
+using Grand.Business.Core.Events.Checkout.Shipping;
using Grand.Domain.Shipping;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs b/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
index 060d7805b..7b5785738 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartEventPublisherExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Events.ShoppingCart;
+using Grand.Business.Core.Events.Checkout.ShoppingCart;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj b/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj
index cba95318e..2ac20c3e9 100644
--- a/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj
+++ b/src/Business/Grand.Business.Checkout/Grand.Business.Checkout.csproj
@@ -4,10 +4,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.Business.Catalog\Grand.Business.Catalog.csproj" />
- <ProjectReference Include="..\Grand.Business.Common\Grand.Business.Common.csproj" />
- <ProjectReference Include="..\Grand.Business.Customers\Grand.Business.Customers.csproj" />
- <ProjectReference Include="..\Grand.Business.Messages\Grand.Business.Messages.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
index 901aca695..e5e61092f 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCancelOrderQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
index ab1400f1a..95b7a275c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanCaptureQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
index 88d250032..cde62e90b 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsAuthorizedQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
index 71c546e5a..e45420697 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanMarkPaymentTransactionAsPaidQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
index 7737a0beb..068f77a4d 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyPaidOfflineQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
index dc180afb3..9cf61df04 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundOfflineQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
index 8dc48baa6..2eca3faa4 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanPartiallyRefundQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
index fb545f59f..95c9f13c3 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundOfflineQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
index 1b9d1650b..4497f2b64 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanRefundQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
index f9599bed3..ffdf938c1 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidOfflineQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
index 41e6a0be7..0ef946abc 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/CanVoidQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
index 7581622a1..cf83165b4 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetGiftVoucherQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
index a75fe0325..337c86bf6 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnCountQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
index 476beae2a..dde990c62 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetMerchandiseReturnQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
index d1c023b47..800d167f6 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetOrderQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
index 211f02317..24cdfa86a 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPaymentTransactionQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
index 774a175d0..10849ac77 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetPickupPointByIdQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Shipping;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
index 5e18c390e..cde351c6a 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/GetVendorsInOrderQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Vendors;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
index 9e35140d3..2f13c083f 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
+++ b/src/Business/Grand.Business.Checkout/Queries/Handlers/Orders/IsMerchandiseReturnAllowedQueryHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain.Orders;
using MediatR;
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
index 852045260..c7607dd92 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeFormatter.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
index a9544758e..247820f3f 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeParser.cs
@@ -1,5 +1,6 @@
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Domain.Common;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
index 8a493a5bd..830bfe288 100644
--- a/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/CheckoutAttributes/CheckoutAttributeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
index d194eac1f..5f665b6a8 100644
--- a/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/GiftVouchers/GiftVoucherService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
index 01c21274d..8c0a2957f 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/LoyaltyPointsService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
index 05e0b6052..cadd33088 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/MerchandiseReturnService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
index f319b26d1..74f3896f5 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderCalculationService.cs
@@ -1,17 +1,17 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
index 72d80062f..4a3c2ca35 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
index 8557461ee..b53fba901 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderStatusService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Data;
using Grand.Domain.Orders;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
index cd2971c59..d0b0ed8de 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/OrderTagService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
index 674afd6db..1baea66ef 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartService.cs
@@ -1,13 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.ShoppingCart;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.ShoppingCart;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -15,7 +14,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Infrastructure.Extensions;
using MediatR;
-
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Business.Checkout.Services.Orders
{
@@ -248,8 +247,7 @@ namespace Grand.Business.Checkout.Services.Orders
else
{
DateTime now = DateTime.UtcNow;
- shoppingCartItem = new ShoppingCartItem
- {
+ shoppingCartItem = new ShoppingCartItem {
ShoppingCartTypeId = shoppingCartType,
StoreId = storeId,
WarehouseId = warehouseId,
@@ -318,8 +316,7 @@ namespace Grand.Business.Checkout.Services.Orders
await _mediator.Publish(new AddToCartEvent(customer, shoppingCartItem, product));
if (automaticallyAddRequiredProductsIfEnabled)
{
- await _mediator.Send(new AddRequiredProductsCommand()
- {
+ await _mediator.Send(new AddRequiredProductsCommand() {
Customer = customer,
Product = product,
ShoppingCartType = shoppingCartItem.ShoppingCartTypeId,
@@ -392,8 +389,7 @@ namespace Grand.Business.Checkout.Services.Orders
{
foreach (var item in groupToBook.Where(x => x.Date >= rentalStartDate && x.Date <= rentalEndDate))
{
- await _productReservationService.InsertCustomerReservationsHelper(new CustomerReservationsHelper
- {
+ await _productReservationService.InsertCustomerReservationsHelper(new CustomerReservationsHelper {
CustomerId = customer.Id,
ReservationId = item.Id,
ShoppingCartItemId = shoppingCartItem.Id
@@ -404,8 +400,7 @@ namespace Grand.Business.Checkout.Services.Orders
{
foreach (var item in groupToBook.Where(x => x.Date >= rentalStartDate && x.Date < rentalEndDate))
{
- await _productReservationService.InsertCustomerReservationsHelper(new CustomerReservationsHelper
- {
+ await _productReservationService.InsertCustomerReservationsHelper(new CustomerReservationsHelper {
CustomerId = customer.Id,
ReservationId = item.Id,
ShoppingCartItemId = shoppingCartItem.Id
@@ -418,8 +413,7 @@ namespace Grand.Business.Checkout.Services.Orders
if (!string.IsNullOrEmpty(reservationId))
{
- await _productReservationService.InsertCustomerReservationsHelper(new CustomerReservationsHelper
- {
+ await _productReservationService.InsertCustomerReservationsHelper(new CustomerReservationsHelper {
CustomerId = customer.Id,
ReservationId = reservationId,
ShoppingCartItemId = shoppingCartItem.Id
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
index b4542d3f3..55550110b 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
@@ -1,15 +1,14 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -17,7 +16,7 @@ using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using MediatR;
-
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Business.Checkout.Services.Orders
{
diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
index 0ff7495a5..050a8ed1a 100644
--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
index b82081b24..518fbdba3 100644
--- a/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Payments/PaymentTransactionService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Payments;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
index 6303c1e04..0ba43da03 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/DeliveryDateService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs
index 1491b877c..7fd29c71b 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/GeneralShipmentTracker.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.TypeSearchers;
namespace Grand.Business.Checkout.Services.Shipping
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
index c70bbf2e6..0430fdff8 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/PickupPointService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
index 06eb36f55..03191ecc8 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShipmentService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
index 008a50ee3..cb744d958 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingMethodService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs
index 7af13668f..633c9b30b 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/ShippingService.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
index 5159bbadc..0c42fd586 100644
--- a/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Shipping/WarehouseService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs b/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs
index 19698654a..829f12ba3 100644
--- a/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Checkout.Services.CheckoutAttributes;
using Grand.Business.Checkout.Services.GiftVouchers;
using Grand.Business.Checkout.Services.Orders;
@@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Business.Checkout.Startup
{
diff --git a/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs b/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
index 65a051e21..756fa570d 100644
--- a/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Cms/Events/BlogPostDeletedEventHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Infrastructure.Events;
using Grand.Domain.Blogs;
using MediatR;
-namespace Grand.Business.Cms.Interfaces.Events
+namespace Grand.Business.Cms.Events
{
public class BlogPostDeletedEventHandler : INotificationHandler<EntityDeleted<BlogPost>>
{
diff --git a/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj b/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj
index abd4e2740..2ac20c3e9 100644
--- a/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj
+++ b/src/Business/Grand.Business.Cms/Grand.Business.Cms.csproj
@@ -4,7 +4,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.Business.Common\Grand.Business.Common.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Cms/Services/BlogService.cs b/src/Business/Grand.Business.Cms/Services/BlogService.cs
index c0684a8de..6ce28e14b 100644
--- a/src/Business/Grand.Business.Cms/Services/BlogService.cs
+++ b/src/Business/Grand.Business.Cms/Services/BlogService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain;
using Grand.Domain.Blogs;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Cms/Services/CookiePreference.cs b/src/Business/Grand.Business.Cms/Services/CookiePreference.cs
index e2597bb43..bdded6489 100644
--- a/src/Business/Grand.Business.Cms/Services/CookiePreference.cs
+++ b/src/Business/Grand.Business.Cms/Services/CookiePreference.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
diff --git a/src/Business/Grand.Business.Cms/Services/NewsService.cs b/src/Business/Grand.Business.Cms/Services/NewsService.cs
index 73f339b08..94a7d5112 100644
--- a/src/Business/Grand.Business.Cms/Services/NewsService.cs
+++ b/src/Business/Grand.Business.Cms/Services/NewsService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
index 817362cb6..c6f92d087 100644
--- a/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
+++ b/src/Business/Grand.Business.Cms/Services/PageLayoutService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Data;
using Grand.Domain.Pages;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Cms/Services/PageService.cs b/src/Business/Grand.Business.Cms/Services/PageService.cs
index 6ab1ec22b..348c73161 100644
--- a/src/Business/Grand.Business.Cms/Services/PageService.cs
+++ b/src/Business/Grand.Business.Cms/Services/PageService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Pages;
diff --git a/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs b/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs
index 19661c600..75573b792 100644
--- a/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs
+++ b/src/Business/Grand.Business.Cms/Services/RobotsTxtService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Common;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Cms/Services/WidgetService.cs b/src/Business/Grand.Business.Cms/Services/WidgetService.cs
index a207f01b1..93d9c35d8 100644
--- a/src/Business/Grand.Business.Cms/Services/WidgetService.cs
+++ b/src/Business/Grand.Business.Cms/Services/WidgetService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Cms;
using Grand.Domain.Customers;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs b/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs
index 77fc1f723..52fb49209 100644
--- a/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Cms/Startup/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Business.Cms.Services;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
diff --git a/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs b/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
index 5c5815bbd..3daf14c60 100644
--- a/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
+++ b/src/Business/Grand.Business.Common/Events/LanguageDeletedEventHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Events;
using Grand.Domain.Localization;
using MediatR;
diff --git a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj b/src/Business/Grand.Business.Common/Grand.Business.Common.csproj
index 123e2192c..c0011cb1e 100644
--- a/src/Business/Grand.Business.Common/Grand.Business.Common.csproj
+++ b/src/Business/Grand.Business.Common/Grand.Business.Common.csproj
@@ -4,11 +4,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" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="MaxMind.GeoIP2" Version="5.1.0" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Utilities\" />
- </ItemGroup>
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
+ </ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs
index 7fa9bc200..1080e69f0 100644
--- a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs
+++ b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeParser.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Localization;
diff --git a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
index 10adf6742..c29c0ede8 100644
--- a/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
+++ b/src/Business/Grand.Business.Common/Services/Addresses/AddressAttributeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Addresses;
+using Grand.Business.Core.Interfaces.Common.Addresses;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
index 2073461e1..24bb632a4 100644
--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Configuration;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
index c256aa3b0..40cfbeba6 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CountryService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Data;
using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
index 3ae3ba607..ad8bfc929 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/CurrencyService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Data;
using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs b/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs
index 809c4ab7e..3ec7ebc06 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/DateTimeService.cs
@@ -1,7 +1,9 @@
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Domain.Directory;
using System.Collections.ObjectModel;
using System.Diagnostics;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Common.Services.Directory
{
/// <summary>
/// Represents a datetime service
@@ -118,10 +120,8 @@ namespace Grand.Business.Common.Interfaces.Directory
/// <summary>
/// Gets the current user time zone
/// </summary>
- public virtual TimeZoneInfo CurrentTimeZone
- {
- get
- {
+ public virtual TimeZoneInfo CurrentTimeZone {
+ get {
if (_timeZoneInfo == null)
{
try
diff --git a/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs b/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs
index d6beccdca..7bf1147ff 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/ExchangeRateService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Providers;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Providers;
using Grand.Domain.Directory;
namespace Grand.Business.Common.Services.Directory
diff --git a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
index a800f95d0..48925d1cd 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/GroupService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs b/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs
index 9c43cbede..c118c64a4 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/HistoryService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.History;
diff --git a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs
index 79a0522dd..9b9b2f83c 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs
+++ b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
index cfcec2375..a889fc712 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/LanguageService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
index 758fc7315..7e3d9428f 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Data;
using Grand.Domain.Localization;
using Grand.Infrastructure;
diff --git a/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs b/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs
index baf9c0ceb..bb7c9e0b1 100644
--- a/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs
+++ b/src/Business/Grand.Business.Common/Services/Logging/ActivityKeywordsProvider.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
namespace Grand.Business.Common.Services.Logging
{
diff --git a/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs b/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs
index 4b3009e70..32786afe3 100644
--- a/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs
+++ b/src/Business/Grand.Business.Common/Services/Logging/CustomerActivityService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs b/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs
index d46134566..1ddcd5fc7 100644
--- a/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs
+++ b/src/Business/Grand.Business.Common/Services/Logging/DefaultLogger.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs b/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs
index 6d6a37e96..d2b7eed0c 100644
--- a/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs
+++ b/src/Business/Grand.Business.Common/Services/Pdf/ViewRenderService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Pdf;
+using Grand.Business.Core.Interfaces.Common.Pdf;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Abstractions;
diff --git a/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs b/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs
index 610fe7469..af20fdc9f 100644
--- a/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs
+++ b/src/Business/Grand.Business.Common/Services/Pdf/WkPdfService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Pdf;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Pdf;
using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.Common/Services/Security/AclService.cs b/src/Business/Grand.Business.Common/Services/Security/AclService.cs
index 35fcf110f..ca7a4b40b 100644
--- a/src/Business/Grand.Business.Common/Services/Security/AclService.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/AclService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
diff --git a/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs b/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
index d864ceb28..c52294c85 100644
--- a/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/EncryptionService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Customers;
using System.Security.Cryptography;
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
index 9a7d0555c..e8a50ed9c 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionProvider.cs
@@ -1,4 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs b/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs
index ba4718e06..46db27918 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs
+++ b/src/Business/Grand.Business.Common/Services/Security/PermissionService.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Permissions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
namespace Grand.Business.Common.Services.Security
{
diff --git a/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs b/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs
index 2373b178b..e94d1249d 100644
--- a/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs
+++ b/src/Business/Grand.Business.Common/Services/Seo/SlugService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain;
using Grand.Domain.Data;
using Grand.Domain.Seo;
diff --git a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
index 32df792b3..5b66cfeca 100644
--- a/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
+++ b/src/Business/Grand.Business.Common/Services/Stores/StoreService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs b/src/Business/Grand.Business.Common/Startup/StartupApplication.cs
index 7ed58e284..23eda25a8 100644
--- a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Common/Startup/StartupApplication.cs
@@ -1,19 +1,18 @@
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Pdf;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Business.Common.Services.Addresses;
using Grand.Business.Common.Services.Configuration;
using Grand.Business.Common.Services.Directory;
using Grand.Business.Common.Services.Localization;
using Grand.Business.Common.Services.Logging;
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.Infrastructure;
@@ -21,7 +20,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-
+using Grand.Business.Common.Services.Security;
namespace Grand.Business.Common.Startup
{
@@ -58,7 +57,7 @@ namespace Grand.Business.Common.Startup
private void RegisterDirectoryService(IServiceCollection serviceCollection)
{
serviceCollection.AddScoped<IDateTimeService, DateTimeService>();
-
+
serviceCollection.AddScoped<ICountryService, CountryService>();
serviceCollection.AddScoped<ICurrencyService, CurrencyService>();
serviceCollection.AddScoped<IExchangeRateService, ExchangeRateService>();
@@ -85,7 +84,7 @@ namespace Grand.Business.Common.Startup
serviceCollection.AddScoped<IPermissionService, PermissionService>();
serviceCollection.AddScoped<IAclService, AclService>();
serviceCollection.AddScoped<IEncryptionService, EncryptionService>();
-
+ serviceCollection.AddScoped<IPermissionProvider, PermissionProvider>();
}
private void RegisterSeoService(IServiceCollection serviceCollection)
diff --git a/src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs
similarity index 87%
rename from src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs
index d69eb7f77..c1551ed8c 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Models/SendNotificationsToSubscribersCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/SendNotificationsToSubscribersCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Common;
using MediatR;
-namespace Grand.Business.Catalog.Commands.Models
+namespace Grand.Business.Core.Commands.Catalog
{
public class SendNotificationsToSubscribersCommand : IRequest<IList<OutOfStockSubscription>>
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Models/SendOutBidCustomerCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs
similarity index 85%
rename from src/Business/Grand.Business.Catalog/Commands/Models/SendOutBidCustomerCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs
index d0935e16e..ba713258f 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Models/SendOutBidCustomerCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/SendOutBidCustomerCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Localization;
using MediatR;
-namespace Grand.Business.Catalog.Commands.Models
+namespace Grand.Business.Core.Commands.Catalog
{
public class SendOutBidCustomerCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Models/SendQuantityBelowStoreOwnerCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs
similarity index 84%
rename from src/Business/Grand.Business.Catalog/Commands/Models/SendQuantityBelowStoreOwnerCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs
index 66a7f679f..334483f95 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Models/SendQuantityBelowStoreOwnerCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/SendQuantityBelowStoreOwnerCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Commands.Models
+namespace Grand.Business.Core.Commands.Catalog
{
public class SendQuantityBelowStoreOwnerCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Models/UpdateIntervalPropertiesCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/UpdateIntervalPropertiesCommand.cs
similarity index 86%
rename from src/Business/Grand.Business.Catalog/Commands/Models/UpdateIntervalPropertiesCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Catalog/UpdateIntervalPropertiesCommand.cs
index 88d80ab04..4eefb43fa 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Models/UpdateIntervalPropertiesCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/UpdateIntervalPropertiesCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Commands.Models
+namespace Grand.Business.Core.Commands.Catalog
{
public class UpdateIntervalPropertiesCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Catalog/Commands/Models/UpdateProductReviewTotalsCommand.cs b/src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs
similarity index 78%
rename from src/Business/Grand.Business.Catalog/Commands/Models/UpdateProductReviewTotalsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs
index 84d4e929d..2a6361505 100644
--- a/src/Business/Grand.Business.Catalog/Commands/Models/UpdateProductReviewTotalsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Catalog/UpdateProductReviewTotalsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Commands.Models
+namespace Grand.Business.Core.Commands.Catalog
{
public class UpdateProductReviewTotalsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ActivatedValueForPurchasedVouchersCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs
similarity index 79%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ActivatedValueForPurchasedVouchersCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs
index 39d7ee070..17cef10b4 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ActivatedValueForPurchasedVouchersCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ActivatedValueForPurchasedVouchersCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ActivatedValueForPurchasedGiftVouchersCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/AddRequiredProductsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs
similarity index 86%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/AddRequiredProductsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs
index 209633d00..425f6ecfe 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/AddRequiredProductsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AddRequiredProductsCommand.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class AddRequiredProductsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/AwardLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs
similarity index 74%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/AwardLoyaltyPointsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs
index 5e8a6534e..fa7bba2b1 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/AwardLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/AwardLoyaltyPointsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class AwardLoyaltyPointsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CalculateLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs
similarity index 79%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/CalculateLoyaltyPointsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs
index 244df972e..ceec0cff7 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CalculateLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CalculateLoyaltyPointsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class CalculateLoyaltyPointsCommand : IRequest<int>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CancelOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs
similarity index 82%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/CancelOrderCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs
index 400d68cb9..df5a125ce 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CancelOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class CancelOrderCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CancelOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs
similarity index 80%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/CancelOrderItemCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs
index 261d330a4..e4e80dfb7 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CancelOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CancelOrderItemCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class CancelOrderItemCommand : IRequest<(bool error, string message)>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs
index 92fad3d52..9ea396d59 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CaptureCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CaptureCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class CaptureCommand : IRequest<IList<string>>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CheckOrderStatusCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs
similarity index 73%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/CheckOrderStatusCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs
index 040d803e2..5994b43df 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/CheckOrderStatusCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/CheckOrderStatusCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class CheckOrderStatusCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/DeleteOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs
similarity index 73%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/DeleteOrderCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs
index df8c06040..17dd15719 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/DeleteOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class DeleteOrderCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/DeleteOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs
similarity index 80%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/DeleteOrderItemCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs
index 780788019..a3007a5ae 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/DeleteOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/DeleteOrderItemCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class DeleteOrderItemCommand : IRequest<(bool error, string message)>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/InsertOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs
similarity index 83%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/InsertOrderItemCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs
index 6f8713d52..61a395c0a 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/InsertOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/InsertOrderItemCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class InsertOrderItemCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/MarkAsAuthorizedCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/MarkAsAuthorizedCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs
index 415f79960..c2b1b5555 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/MarkAsAuthorizedCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsAuthorizedCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class MarkAsAuthorizedCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/MarkAsPaidCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/MarkAsPaidCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs
index 64bb1c590..a7c534f00 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/MarkAsPaidCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MarkAsPaidCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class MarkAsPaidCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/MaxOrderNumberCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs
similarity index 70%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/MaxOrderNumberCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs
index 16fa3215c..f42f4cbfa 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/MaxOrderNumberCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/MaxOrderNumberCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class MaxOrderNumberCommand : IRequest<int?>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyPaidOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs
similarity index 80%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyPaidOfflineCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs
index 08f558c7e..c228bbbbb 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyPaidOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyPaidOfflineCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class PartiallyPaidOfflineCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs
similarity index 81%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs
index ecf7b3c32..bd01069dc 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class PartiallyRefundCommand : IRequest<IList<string>>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs
similarity index 81%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundOfflineCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs
index d9dee9ae1..fdaff4f39 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PartiallyRefundOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PartiallyRefundOfflineCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class PartiallyRefundOfflineCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs
new file mode 100644
index 000000000..05f5553b0
--- /dev/null
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PlaceOrderCommand.cs
@@ -0,0 +1,10 @@
+using Grand.Business.Core.Utilities.Checkout;
+using MediatR;
+
+namespace Grand.Business.Core.Commands.Checkout.Orders
+{
+ public class PlaceOrderCommand : IRequest<PlaceOrderResult>
+ {
+
+ }
+}
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PrepareOrderCodeCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs
similarity index 62%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/PrepareOrderCodeCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs
index d312e3535..b386bf595 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/PrepareOrderCodeCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/PrepareOrderCodeCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class PrepareOrderCodeCommand : IRequest<string>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ProcessOrderPaidCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs
similarity index 73%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ProcessOrderPaidCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs
index 59caf07e9..76ebec15b 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ProcessOrderPaidCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ProcessOrderPaidCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ProcessOrderPaidCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs
similarity index 73%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs
index 7a169bdf3..f9e978f00 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReOrderCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReOrderCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ReOrderCommand : IRequest<IList<string>>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReduceLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs
similarity index 74%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReduceLoyaltyPointsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs
index 182dde450..e6a31c0f6 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReduceLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReduceLoyaltyPointsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ReduceLoyaltyPointsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs
index 2c0516843..17a709b64 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class RefundCommand : IRequest<IList<string>>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundOfflineCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs
index ed86afa3c..05c06473d 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/RefundOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/RefundOfflineCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class RefundOfflineCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
similarity index 75%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
index e001ace1f..e96976476 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ReturnBackRedeemedLoyaltyPointsCommand.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ReturnBackRedeemedLoyaltyPointsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/SetOrderStatusCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs
similarity index 84%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/SetOrderStatusCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs
index 429e77172..090d4a1fc 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/SetOrderStatusCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/SetOrderStatusCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class SetOrderStatusCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/UpdateOrderItemCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs
similarity index 78%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/UpdateOrderItemCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs
index 5016ead74..e78664cc2 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/UpdateOrderItemCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/UpdateOrderItemCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class UpdateOrderItemCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
similarity index 82%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
index cfa65c660..bb55c67b7 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateMinShoppingCartSubtotalAmountCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ValidateMinShoppingCartSubtotalAmountCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateShoppingCartTotalAmountCommand.cs
similarity index 82%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateShoppingCartTotalAmountCommand.cs
index fe8bd168e..c0cb4d618 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/ValidateShoppingCartTotalAmountCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/ValidateShoppingCartTotalAmountCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class ValidateShoppingCartTotalAmountCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs
index 223cbc12a..0f27cd011 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class VoidCommand : IRequest<IList<string>>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidOfflineCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidOfflineCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs
index 95eb8b732..22f184211 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Orders/VoidOfflineCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Orders/VoidOfflineCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Orders
+namespace Grand.Business.Core.Commands.Checkout.Orders
{
public class VoidOfflineCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Shipping/DeliveryCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs
similarity index 78%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Shipping/DeliveryCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs
index ccdd20c4e..0129a76c6 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Shipping/DeliveryCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/DeliveryCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Shipping
+namespace Grand.Business.Core.Commands.Checkout.Shipping
{
public class DeliveryCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Commands/Models/Shipping/ShipCommand.cs b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs
similarity index 77%
rename from src/Business/Grand.Business.Checkout/Commands/Models/Shipping/ShipCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs
index f56080aa9..6442e041e 100644
--- a/src/Business/Grand.Business.Checkout/Commands/Models/Shipping/ShipCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Checkout/Shipping/ShipCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Commands.Models.Shipping
+namespace Grand.Business.Core.Commands.Checkout.Shipping
{
public class ShipCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs b/src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs
similarity index 87%
rename from src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs
index 55f885f3b..fb6ebfc07 100644
--- a/src/Business/Grand.Business.Customers/Commands/Models/ActiveVendorCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Customers/ActiveVendorCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Customers.Commands.Models
+namespace Grand.Business.Core.Commands.Customers
{
public class ActiveVendorCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Authentication/Events/RegisteredByExternalMethodEventHandler.cs b/src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs
similarity index 75%
rename from src/Business/Grand.Business.Authentication/Events/RegisteredByExternalMethodEventHandler.cs
rename to src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs
index e7c6b76bf..e54bb7b87 100644
--- a/src/Business/Grand.Business.Authentication/Events/RegisteredByExternalMethodEventHandler.cs
+++ b/src/Business/Grand.Business.Core/Commands/Customers/RegisteredByExternalMethod.cs
@@ -1,17 +1,17 @@
-using Grand.Business.Authentication.Utilities;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Utilities.Authentication;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Authentication.Events
+namespace Grand.Business.Core.Commands.Customers
{
/// <summary>
/// Automatic customer registration by external authentication method event
/// </summary>
- public class RegisteredByExternalMethodEventHandler : INotification
+ public class RegisteredByExternalMethod : INotification
{
- public RegisteredByExternalMethodEventHandler(
- Customer customer,
+ public RegisteredByExternalMethod(
+ Customer customer,
ExternalAuthParam parameters,
RegistrationResult registrationResult)
{
diff --git a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs b/src/Business/Grand.Business.Core/Commands/Marketing/CustomerActionEventConditionCommand.cs
similarity index 93%
rename from src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Marketing/CustomerActionEventConditionCommand.cs
index 81311be82..b2ad9eba5 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventConditionCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Marketing/CustomerActionEventConditionCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Marketing.Commands.Models
+namespace Grand.Business.Core.Commands.Marketing
{
public class CustomerActionEventConditionCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs b/src/Business/Grand.Business.Core/Commands/Marketing/CustomerActionEventReactionCommand.cs
similarity index 91%
rename from src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Marketing/CustomerActionEventReactionCommand.cs
index 153f51801..488294564 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Models/CustomerActionEventReactionCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Marketing/CustomerActionEventReactionCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Marketing.Commands.Models
+namespace Grand.Business.Core.Commands.Marketing
{
public class CustomerActionEventReactionCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs
similarity index 93%
rename from src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs
index 8bec259c3..888c0cdc8 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Common/InsertContactUsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Common/InsertContactUsCommand.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class InsertContactUsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetAttributeCombinationTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs
similarity index 71%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetAttributeCombinationTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs
index 236cbf749..ca0de4856 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetAttributeCombinationTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAttributeCombinationTokensCommand.cs
@@ -1,8 +1,8 @@
using Grand.Domain.Catalog;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetAttributeCombinationTokensCommand : IRequest<LiquidAttributeCombination>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetAuctionTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs
similarity index 66%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetAuctionTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs
index 90d70a7ca..d02aee823 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetAuctionTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetAuctionTokensCommand.cs
@@ -1,8 +1,8 @@
using Grand.Domain.Catalog;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetAuctionTokensCommand : IRequest<LiquidAuctions>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetGiftVoucherTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs
similarity index 71%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetGiftVoucherTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs
index abcdfa17d..cb1a8a208 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetGiftVoucherTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetGiftVoucherTokensCommand.cs
@@ -1,9 +1,9 @@
using Grand.Domain.Localization;
using Grand.Domain.Orders;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetGiftVoucherTokensCommand : IRequest<LiquidGiftVoucher>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs
similarity index 82%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs
index 3f3af103e..57d4e0398 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetMerchandiseReturnTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetMerchandiseReturnTokensCommand.cs
@@ -1,10 +1,10 @@
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetMerchandiseReturnTokensCommand : IRequest<LiquidMerchandiseReturn>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs
similarity index 83%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs
index 7e7043d1c..055f1e99d 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetOrderTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetOrderTokensCommand.cs
@@ -2,10 +2,10 @@
using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetOrderTokensCommand : IRequest<LiquidOrder>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs
similarity index 80%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs
index 440a3885f..b6f816ee5 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShipmentTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShipmentTokensCommand.cs
@@ -2,10 +2,10 @@
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetShipmentTokensCommand : IRequest<LiquidShipment>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs
similarity index 74%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs
index e7f8bb331..93b77b9d5 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetShoppingCartTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetShoppingCartTokensCommand.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetShoppingCartTokensCommand : IRequest<LiquidShoppingCart>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetStoreTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs
similarity index 75%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetStoreTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs
index bfa80249c..9de82b34b 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetStoreTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetStoreTokensCommand.cs
@@ -1,10 +1,10 @@
using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Domain.Stores;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetStoreTokensCommand : IRequest<LiquidStore>
{
diff --git a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetVendorTokensCommand.cs b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs
similarity index 69%
rename from src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetVendorTokensCommand.cs
rename to src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs
index fe3d07dc8..dc5dda436 100644
--- a/src/Business/Grand.Business.Messages/Commands/Models/Tokens/GetVendorTokensCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/Messages/Tokens/GetVendorTokensCommand.cs
@@ -1,9 +1,9 @@
using Grand.Domain.Localization;
using Grand.Domain.Vendors;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
-namespace Grand.Business.Messages.Commands.Models
+namespace Grand.Business.Core.Commands.Messages
{
public class GetVendorTokensCommand : IRequest<LiquidVendor>
{
diff --git a/src/Business/Grand.Business.System/Commands/Models/Common/ClearMostViewedCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs
similarity index 62%
rename from src/Business/Grand.Business.System/Commands/Models/Common/ClearMostViewedCommand.cs
rename to src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs
index 4aa4fef9d..a2aad7892 100644
--- a/src/Business/Grand.Business.System/Commands/Models/Common/ClearMostViewedCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Common/ClearMostViewedCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.System.Commands.Models.Common
+namespace Grand.Business.Core.Commands.System.Common
{
public class ClearMostViewedCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.System/Commands/Models/Common/DeleteActivitylogCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Common/DeleteActivitylogCommand.cs
similarity index 63%
rename from src/Business/Grand.Business.System/Commands/Models/Common/DeleteActivitylogCommand.cs
rename to src/Business/Grand.Business.Core/Commands/System/Common/DeleteActivitylogCommand.cs
index b5952b7f7..27719eecf 100644
--- a/src/Business/Grand.Business.System/Commands/Models/Common/DeleteActivitylogCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Common/DeleteActivitylogCommand.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.System.Commands.Models.Common
+namespace Grand.Business.Core.Commands.System.Common
{
public class DeleteActivitylogCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.System/Commands/Models/Common/GetSitemapXmlCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs
similarity index 81%
rename from src/Business/Grand.Business.System/Commands/Models/Common/GetSitemapXmlCommand.cs
rename to src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs
index 56cea04e9..61ee9c5c5 100644
--- a/src/Business/Grand.Business.System/Commands/Models/Common/GetSitemapXmlCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Common/GetSitemapXmlCommand.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Stores;
using MediatR;
-namespace Grand.Business.System.Commands.Models.Common
+namespace Grand.Business.Core.Commands.System.Common
{
public class GetSitemapXmlCommand : IRequest<string>
{
diff --git a/src/Business/Grand.Business.System/Commands/Models/Security/InstallNewPermissionsCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Security/InstallNewPermissionsCommand.cs
similarity index 59%
rename from src/Business/Grand.Business.System/Commands/Models/Security/InstallNewPermissionsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/System/Security/InstallNewPermissionsCommand.cs
index bcdcc1061..83e845621 100644
--- a/src/Business/Grand.Business.System/Commands/Models/Security/InstallNewPermissionsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Security/InstallNewPermissionsCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using MediatR;
-namespace Grand.Business.System.Commands.Models.Security
+namespace Grand.Business.Core.Commands.System.Security
{
public class InstallNewPermissionsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.System/Commands/Models/Security/InstallPermissionsCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Security/InstallPermissionsCommand.cs
similarity index 58%
rename from src/Business/Grand.Business.System/Commands/Models/Security/InstallPermissionsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/System/Security/InstallPermissionsCommand.cs
index 9c4fe4a80..ffd0486ba 100644
--- a/src/Business/Grand.Business.System/Commands/Models/Security/InstallPermissionsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Security/InstallPermissionsCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using MediatR;
-namespace Grand.Business.System.Commands.Models.Security
+namespace Grand.Business.Core.Commands.System.Security
{
public class InstallPermissionsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.System/Commands/Models/Security/UninstallPermissionsCommand.cs b/src/Business/Grand.Business.Core/Commands/System/Security/UninstallPermissionsCommand.cs
similarity index 59%
rename from src/Business/Grand.Business.System/Commands/Models/Security/UninstallPermissionsCommand.cs
rename to src/Business/Grand.Business.Core/Commands/System/Security/UninstallPermissionsCommand.cs
index 1c1384f95..cdb28cf71 100644
--- a/src/Business/Grand.Business.System/Commands/Models/Security/UninstallPermissionsCommand.cs
+++ b/src/Business/Grand.Business.Core/Commands/System/Security/UninstallPermissionsCommand.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using MediatR;
-namespace Grand.Business.System.Commands.Models.Security
+namespace Grand.Business.Core.Commands.System.Security
{
public class UninstallPermissionsCommand : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Enum/PaymentMethodType.cs b/src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.cs
similarity index 81%
rename from src/Business/Grand.Business.Checkout/Enum/PaymentMethodType.cs
rename to src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.cs
index 145afdd5b..8f335e2aa 100644
--- a/src/Business/Grand.Business.Checkout/Enum/PaymentMethodType.cs
+++ b/src/Business/Grand.Business.Core/Enums/Checkout/PaymentMethodType.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Checkout.Enum
+namespace Grand.Business.Core.Enums.Checkout
{
/// <summary>
/// Represents a payment method type
diff --git a/src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs b/src/Business/Grand.Business.Core/Enums/Checkout/ShipmentStatusEvent.cs
similarity index 92%
rename from src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs
rename to src/Business/Grand.Business.Core/Enums/Checkout/ShipmentStatusEvent.cs
index 78ca83b74..8140ae925 100644
--- a/src/Business/Grand.Business.Checkout/Enum/ShipmentStatusEvent.cs
+++ b/src/Business/Grand.Business.Core/Enums/Checkout/ShipmentStatusEvent.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Checkout.Enum
+namespace Grand.Business.Core.Enums.Checkout
{
/// <summary>
/// Shipment status event
diff --git a/src/Business/Grand.Business.Checkout/Enum/ShippingRateCalculationType.cs b/src/Business/Grand.Business.Core/Enums/Checkout/ShippingRateCalculationType.cs
similarity index 87%
rename from src/Business/Grand.Business.Checkout/Enum/ShippingRateCalculationType.cs
rename to src/Business/Grand.Business.Core/Enums/Checkout/ShippingRateCalculationType.cs
index 5e8d2dc65..bc63f8527 100644
--- a/src/Business/Grand.Business.Checkout/Enum/ShippingRateCalculationType.cs
+++ b/src/Business/Grand.Business.Core/Enums/Checkout/ShippingRateCalculationType.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Checkout.Enum
+namespace Grand.Business.Core.Enums.Checkout
{
/// <summary>
/// Represents a shipping rate method type
diff --git a/src/Business/Grand.Business.Core/Enums/Messages/SecureSocketOptions.cs b/src/Business/Grand.Business.Core/Enums/Messages/SecureSocketOptions.cs
new file mode 100644
index 000000000..5330de659
--- /dev/null
+++ b/src/Business/Grand.Business.Core/Enums/Messages/SecureSocketOptions.cs
@@ -0,0 +1,33 @@
+namespace Grand.Business.Core.Enums.Messages
+{
+ public enum SecureSocketOptions
+ {
+ //
+ // Summary:
+ // No SSL or TLS encryption should be used.
+ None = 0,
+ //
+ // Summary:
+ // Allow the MailKit.IMailService to decide which SSL or TLS options to use (default).
+ // If the server does not support SSL or TLS, then the connection will continue
+ // without any encryption.
+ Auto = 1,
+ //
+ // Summary:
+ // The connection should use SSL or TLS encryption immediately.
+ SslOnConnect = 2,
+ //
+ // Summary:
+ // Elevates the connection to use TLS encryption immediately after reading the greeting
+ // and capabilities of the server. If the server does not support the STARTTLS extension,
+ // then the connection will fail and a System.NotSupportedException will be thrown.
+ StartTls = 3,
+ //
+ // Summary:
+ // Elevates the connection to use TLS encryption immediately after reading the greeting
+ // and capabilities of the server, but only if the server supports the STARTTLS
+ // extension.
+ StartTlsWhenAvailable = 4
+
+ }
+}
diff --git a/src/Business/Grand.Business.Catalog/Events/Models/ProductPublishEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs
similarity index 85%
rename from src/Business/Grand.Business.Catalog/Events/Models/ProductPublishEvent.cs
rename to src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs
index 2ac688e8e..62b4e91c1 100644
--- a/src/Business/Grand.Business.Catalog/Events/Models/ProductPublishEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/ProductPublishEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Events.Models
+namespace Grand.Business.Core.Events.Catalog
{
public class ProductPublishEvent : INotification
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Models/ProductReviewApprovedEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs
similarity index 89%
rename from src/Business/Grand.Business.Catalog/Events/Models/ProductReviewApprovedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs
index c4ea8e5bb..a08f32c93 100644
--- a/src/Business/Grand.Business.Catalog/Events/Models/ProductReviewApprovedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/ProductReviewApprovedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Events.Models
+namespace Grand.Business.Core.Events.Catalog
{
/// <summary>
/// Event for product review approval
diff --git a/src/Business/Grand.Business.Catalog/Events/Models/ProductUnPublishEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs
similarity index 85%
rename from src/Business/Grand.Business.Catalog/Events/Models/ProductUnPublishEvent.cs
rename to src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs
index efec0fb50..84a0ea716 100644
--- a/src/Business/Grand.Business.Catalog/Events/Models/ProductUnPublishEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/ProductUnPublishEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Events.Models
+namespace Grand.Business.Core.Events.Catalog
{
public class ProductUnPublishEvent : INotification
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Models/UpdateProductOnCartEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs
similarity index 87%
rename from src/Business/Grand.Business.Catalog/Events/Models/UpdateProductOnCartEvent.cs
rename to src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs
index 4bb0d59de..ac9d434ef 100644
--- a/src/Business/Grand.Business.Catalog/Events/Models/UpdateProductOnCartEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/UpdateProductOnCartEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Events.Models
+namespace Grand.Business.Core.Events.Catalog
{
public class UpdateProductOnCartEvent : INotification
{
diff --git a/src/Business/Grand.Business.Catalog/Events/Models/UpdateStockEvent.cs b/src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs
similarity index 87%
rename from src/Business/Grand.Business.Catalog/Events/Models/UpdateStockEvent.cs
rename to src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs
index 1e5d4008f..3cbbfade2 100644
--- a/src/Business/Grand.Business.Catalog/Events/Models/UpdateStockEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Catalog/UpdateStockEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Events.Models
+namespace Grand.Business.Core.Events.Catalog
{
public class UpdateStockEvent : INotification
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/CapturePaymentTransactionDetailsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs
similarity index 84%
rename from src/Business/Grand.Business.Checkout/Events/Orders/CapturePaymentTransactionDetailsEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs
index c5b74685c..be0157ed4 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/CapturePaymentTransactionDetailsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/CapturePaymentTransactionDetailsEvent.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
public class CapturePaymentTransactionDetailsEvent<R, C> : INotification where R : CapturePaymentResult where C : PaymentTransaction
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderCancelledEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs
similarity index 88%
rename from src/Business/Grand.Business.Checkout/Events/Orders/OrderCancelledEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs
index cf4db2ea8..e4059e4dc 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderCancelledEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderCancelledEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order cancelled event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs
similarity index 87%
rename from src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs
index 28833cce3..d63baa11b 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderDeletedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderDeletedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order deleted event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPaidEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs
similarity index 87%
rename from src/Business/Grand.Business.Checkout/Events/Orders/OrderPaidEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs
index 4eba669c6..78949d5c5 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPaidEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPaidEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order paid event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs
similarity index 87%
rename from src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs
index f100e6ee5..feda2df22 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/OrderPlacedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/OrderPlacedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order placed event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
index 408b02959..81216de78 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionMarkAsAuthorizedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order mark as authorized event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionRefundedEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs
similarity index 92%
rename from src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionRefundedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs
index 220d24412..d5bf1290d 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionRefundedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionRefundedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order refunded event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionVoidOfflineEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionVoidOfflineEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs
index 716627b52..0e271f691 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/PaymentTransactionVoidOfflineEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PaymentTransactionVoidOfflineEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
/// <summary>
/// Order void offline event
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/PlaceOrderDetailsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs
similarity index 82%
rename from src/Business/Grand.Business.Checkout/Events/Orders/PlaceOrderDetailsEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs
index 518d26f50..be74f0477 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/PlaceOrderDetailsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/PlaceOrderDetailsEvent.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Utilities.Checkout;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
public class PlaceOrderDetailsEvent<R, O> : INotification where R : PlaceOrderResult where O : PlaceOrderContainter
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Orders/VoidPaymentTransactionDetailsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs
similarity index 84%
rename from src/Business/Grand.Business.Checkout/Events/Orders/VoidPaymentTransactionDetailsEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs
index c78e781cc..e875f1a0b 100644
--- a/src/Business/Grand.Business.Checkout/Events/Orders/VoidPaymentTransactionDetailsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Orders/VoidPaymentTransactionDetailsEvent.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Events.Orders
+namespace Grand.Business.Core.Events.Checkout.Orders
{
public class VoidPaymentTransactionDetailsEvent<R, C> : INotification where R : VoidPaymentResult where C : PaymentTransaction
{
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeliveredEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs
similarity index 88%
rename from src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeliveredEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs
index 2b8705f74..6eeb7ee6a 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentDeliveredEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentDeliveredEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Events.Shipping
+namespace Grand.Business.Core.Events.Checkout.Shipping
{
/// <summary>
/// Shipment delivered event
diff --git a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentSentEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs
similarity index 88%
rename from src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentSentEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs
index 18c8951b1..806a3e49d 100644
--- a/src/Business/Grand.Business.Checkout/Events/Shipping/ShipmentSentEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/Shipping/ShipmentSentEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Events.Shipping
+namespace Grand.Business.Core.Events.Checkout.Shipping
{
/// <summary>
/// Shipment sent event
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/AddToCartEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs
similarity index 92%
rename from src/Business/Grand.Business.Checkout/Events/ShoppingCart/AddToCartEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs
index e04f74557..62de3a097 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/AddToCartEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/AddToCartEvent.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.ShoppingCart
+namespace Grand.Business.Core.Events.Checkout.ShoppingCart
{
public class AddToCartEvent : INotification
{
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs
similarity index 94%
rename from src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs
index df31d5805..44da336ad 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartItemWarningsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartItemWarningsEvent.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.ShoppingCart
+namespace Grand.Business.Core.Events.Checkout.ShoppingCart
{
public class ShoppingCartItemWarningsEvent<C, S, P> : INotification where C : Customer where S : ShoppingCartItem where P : Product
{
diff --git a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs
rename to src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs
index b68dc1b93..bedab7e70 100644
--- a/src/Business/Grand.Business.Checkout/Events/ShoppingCart/ShoppingCartWarningsEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Checkout/ShoppingCart/ShoppingCartWarningsEvent.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Events.ShoppingCart
+namespace Grand.Business.Core.Events.Checkout.ShoppingCart
{
public class ShoppingCartWarningsEvent<T, U> : INotification where U : ShoppingCartItem
{
diff --git a/src/Business/Grand.Business.Customers/Events/CustomerLoggedInEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Customers/Events/CustomerLoggedInEvent.cs
rename to src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs
index b45e09923..792ec6248 100644
--- a/src/Business/Grand.Business.Customers/Events/CustomerLoggedInEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedInEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Customers.Events
+namespace Grand.Business.Core.Events.Customers
{
/// <summary>
/// Customer logged-in event
diff --git a/src/Business/Grand.Business.Customers/Events/CustomerLoggedOutEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Customers/Events/CustomerLoggedOutEvent.cs
rename to src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs
index 61c0ca92d..2acb4b18c 100644
--- a/src/Business/Grand.Business.Customers/Events/CustomerLoggedOutEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerLoggedOutEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Customers.Events
+namespace Grand.Business.Core.Events.Customers
{
/// <summary>
/// Customer logged-in event
diff --git a/src/Business/Grand.Business.Customers/Events/CustomerRegisteredEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Customers/Events/CustomerRegisteredEvent.cs
rename to src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs
index 45d576bef..15f72e099 100644
--- a/src/Business/Grand.Business.Customers/Events/CustomerRegisteredEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegisteredEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Customers.Events
+namespace Grand.Business.Core.Events.Customers
{
/// <summary>
/// Customer registered event
diff --git a/src/Business/Grand.Business.Customers/Events/CustomerRegistrationEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs
similarity index 83%
rename from src/Business/Grand.Business.Customers/Events/CustomerRegistrationEvent.cs
rename to src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs
index 3f47db12d..b8114a257 100644
--- a/src/Business/Grand.Business.Customers/Events/CustomerRegistrationEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/CustomerRegistrationEvent.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Utilities.Customers;
using MediatR;
-namespace Grand.Business.Customers.Events
+namespace Grand.Business.Core.Events.Customers
{
public class CustomerRegistrationEvent<C, R> : INotification where C : RegistrationResult where R : RegistrationRequest
{
diff --git a/src/Business/Grand.Business.Customers/Events/VendorActivationEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs
similarity index 88%
rename from src/Business/Grand.Business.Customers/Events/VendorActivationEvent.cs
rename to src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs
index e7c7178a8..8cbdb31e4 100644
--- a/src/Business/Grand.Business.Customers/Events/VendorActivationEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/VendorActivationEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Customers.Events
+namespace Grand.Business.Core.Events.Customers
{
public class VendorActivationEvent : INotification
{
diff --git a/src/Business/Grand.Business.Customers/Events/VendorReviewApprovedEvent.cs b/src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Customers/Events/VendorReviewApprovedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs
index 277a72c87..ba96d1f6b 100644
--- a/src/Business/Grand.Business.Customers/Events/VendorReviewApprovedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Customers/VendorReviewApprovedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Customers.Events
+namespace Grand.Business.Core.Events.Customers
{
/// <summary>
/// Vendor review approved event
diff --git a/src/Business/Grand.Business.Marketing/Events/CustomerCoordinatesEvent.cs b/src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs
similarity index 90%
rename from src/Business/Grand.Business.Marketing/Events/CustomerCoordinatesEvent.cs
rename to src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs
index 9cef7beb4..2a97ef8a5 100644
--- a/src/Business/Grand.Business.Marketing/Events/CustomerCoordinatesEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Marketing/CustomerCoordinatesEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Marketing.Events
+namespace Grand.Business.Core.Events.Marketing
{
/// <summary>
/// Customer coordinates save - event
diff --git a/src/Business/Grand.Business.Marketing/Events/EmailSubscribedEvent.cs b/src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs
similarity index 95%
rename from src/Business/Grand.Business.Marketing/Events/EmailSubscribedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs
index dfeeb78d0..7612073a0 100644
--- a/src/Business/Grand.Business.Marketing/Events/EmailSubscribedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Marketing/EmailSubscribedEvent.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.Marketing.Events
+namespace Grand.Business.Core.Events.Marketing
{
public class EmailSubscribedEvent : INotification
{
diff --git a/src/Business/Grand.Business.Marketing/Events/EmailUnsubscribedEvent.cs b/src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs
similarity index 95%
rename from src/Business/Grand.Business.Marketing/Events/EmailUnsubscribedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs
index f82be96a4..e18858655 100644
--- a/src/Business/Grand.Business.Marketing/Events/EmailUnsubscribedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Marketing/EmailUnsubscribedEvent.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.Marketing.Events
+namespace Grand.Business.Core.Events.Marketing
{
public class EmailUnsubscribedEvent : INotification
{
diff --git a/src/Business/Grand.Business.Messages/Events/EntityTokensAddedEvent.cs b/src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs
similarity index 95%
rename from src/Business/Grand.Business.Messages/Events/EntityTokensAddedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs
index 728d3753b..926ff304a 100644
--- a/src/Business/Grand.Business.Messages/Events/EntityTokensAddedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Messages/EntityTokensAddedEvent.cs
@@ -3,7 +3,7 @@ using Grand.Domain;
using Grand.Domain.Messages;
using MediatR;
-namespace Grand.Business.Messages.Events
+namespace Grand.Business.Core.Events.Messages
{
/// <summary>
/// A container for tokens that are added.
diff --git a/src/Business/Grand.Business.Messages/Events/MessageTokensAddedEvent.cs b/src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs
similarity index 93%
rename from src/Business/Grand.Business.Messages/Events/MessageTokensAddedEvent.cs
rename to src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs
index c51982da2..637a3e951 100644
--- a/src/Business/Grand.Business.Messages/Events/MessageTokensAddedEvent.cs
+++ b/src/Business/Grand.Business.Core/Events/Messages/MessageTokensAddedEvent.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Messages;
using MediatR;
-namespace Grand.Business.Messages.Events
+namespace Grand.Business.Core.Events.Messages
{
/// <summary>
/// A container for tokens that are added.
diff --git a/src/Business/Grand.Business.Common/Extensions/AddressAttributeExtensions.cs b/src/Business/Grand.Business.Core/Extensions/AddressAttributeExtensions.cs
similarity index 96%
rename from src/Business/Grand.Business.Common/Extensions/AddressAttributeExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/AddressAttributeExtensions.cs
index cc52b6bfa..1c42e201b 100644
--- a/src/Business/Grand.Business.Common/Extensions/AddressAttributeExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/AddressAttributeExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs b/src/Business/Grand.Business.Core/Extensions/AddressExtensions.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/AddressExtensions.cs
index 7387a9265..e89cbb637 100644
--- a/src/Business/Grand.Business.Common/Extensions/AddressExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/AddressExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Common;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class AddressExtensions
{
diff --git a/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs b/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs
similarity index 96%
rename from src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs
index 37a9cbf63..1b339adfd 100644
--- a/src/Business/Grand.Business.Customers/Extensions/AffiliateExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Affiliates;
using Grand.Domain.Seo;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
-namespace Grand.Business.Customers.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class AffiliateExtensions
{
diff --git a/src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs b/src/Business/Grand.Business.Core/Extensions/BlogExtensions.cs
similarity index 94%
rename from src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/BlogExtensions.cs
index f9bfcd35c..27d715dd8 100644
--- a/src/Business/Grand.Business.Cms/Extensions/BlogExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/BlogExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Blogs;
-namespace Grand.Business.Cms.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs b/src/Business/Grand.Business.Core/Extensions/CheckoutAttributeExtensions.cs
similarity index 98%
rename from src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/CheckoutAttributeExtensions.cs
index 0f516cc43..d201b40a7 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/CheckoutAttributeExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/CheckoutAttributeExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Marketing/Extensions/ContactAttributeExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ContactAttributeExtensions.cs
similarity index 97%
rename from src/Business/Grand.Business.Marketing/Extensions/ContactAttributeExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ContactAttributeExtensions.cs
index 0ea11a0dc..e525ee754 100644
--- a/src/Business/Grand.Business.Marketing/Extensions/ContactAttributeExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ContactAttributeExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Customers/Extensions/CustomerAttributeExtensions.cs b/src/Business/Grand.Business.Core/Extensions/CustomerAttributeExtensions.cs
similarity index 95%
rename from src/Business/Grand.Business.Customers/Extensions/CustomerAttributeExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/CustomerAttributeExtensions.cs
index 750a120a4..4e2aac27a 100644
--- a/src/Business/Grand.Business.Customers/Extensions/CustomerAttributeExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/CustomerAttributeExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ExternalAuthenticationProviderExtensions.cs
similarity index 92%
rename from src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ExternalAuthenticationProviderExtensions.cs
index 1569266ee..5059b5e94 100644
--- a/src/Business/Grand.Business.Authentication/Extensions/ExternalAuthenticationProviderExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ExternalAuthenticationProviderExtensions.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Domain.Customers;
-namespace Grand.Business.Authentication.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions of external authentication method
diff --git a/src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs b/src/Business/Grand.Business.Core/Extensions/HistoryExtensions.cs
similarity index 88%
rename from src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/HistoryExtensions.cs
index fa2ea25d2..40a9e27ac 100644
--- a/src/Business/Grand.Business.Common/Extensions/HistoryExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/HistoryExtensions.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain;
using Grand.Domain.History;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class HistoryExtensions
{
diff --git a/src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs b/src/Business/Grand.Business.Core/Extensions/KnowledgebaseExtensions.cs
similarity index 96%
rename from src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/KnowledgebaseExtensions.cs
index 5934486ef..7b7c40178 100644
--- a/src/Business/Grand.Business.Marketing/Extensions/KnowledgebaseExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/KnowledgebaseExtensions.cs
@@ -1,10 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Domain.Knowledgebase;
using Grand.Infrastructure;
-namespace Grand.Business.Marketing.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs b/src/Business/Grand.Business.Core/Extensions/LoggingExtensions.cs
similarity index 94%
rename from src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/LoggingExtensions.cs
index dd13c92b0..cb7ac77b5 100644
--- a/src/Business/Grand.Business.Common/Extensions/LoggingExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/LoggingExtensions.cs
@@ -1,8 +1,8 @@
using Grand.Domain.Customers;
using Grand.Domain.Logging;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class LoggingExtensions
{
diff --git a/src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs b/src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs
similarity index 88%
rename from src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs
index 70501365e..78631d56a 100644
--- a/src/Business/Grand.Business.Messages/Extensions/MessagesEventPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/MessagesEventPublisherExtensions.cs
@@ -1,10 +1,10 @@
using DotLiquid;
-using Grand.Business.Messages.Events;
+using Grand.Business.Core.Events.Messages;
using Grand.Domain;
using Grand.Domain.Messages;
using MediatR;
-namespace Grand.Business.Messages.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class MessagesEventPublisherExtensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs b/src/Business/Grand.Business.Core/Extensions/OrderExtensions.cs
similarity index 99%
rename from src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/OrderExtensions.cs
index fc1f1cde5..8f1b3e0fa 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/OrderExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/OrderExtensions.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class OrderExtensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs b/src/Business/Grand.Business.Core/Extensions/PaymentExtensions.cs
similarity index 94%
rename from src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/PaymentExtensions.cs
index 06d5279cf..046a359b5 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/PaymentExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/PaymentExtensions.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Payment extensions
diff --git a/src/Business/Grand.Business.Catalog/Extensions/ProductAttributeExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ProductAttributeExtensions.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Extensions/ProductAttributeExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ProductAttributeExtensions.cs
index e50e2b9a8..d3006fcb3 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/ProductAttributeExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ProductAttributeExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class ProductAttributeExtensions
{
diff --git a/src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ProductExtensions.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ProductExtensions.cs
index 9d54c0bdb..f12fc9fa5 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/ProductExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ProductExtensions.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Media;
-namespace Grand.Business.Catalog.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class ProductExtensions
{
diff --git a/src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs b/src/Business/Grand.Business.Core/Extensions/RoundingHelper.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs
rename to src/Business/Grand.Business.Core/Extensions/RoundingHelper.cs
index b4f505b1e..8b8047e27 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/RoundingHelper.cs
+++ b/src/Business/Grand.Business.Core/Extensions/RoundingHelper.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Directory;
-namespace Grand.Business.Catalog.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class RoundingHelper
{
diff --git a/src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs b/src/Business/Grand.Business.Core/Extensions/SeoExtensions.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/SeoExtensions.cs
index f12d88ec4..efec5df4c 100644
--- a/src/Business/Grand.Business.Common/Extensions/SeoExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/SeoExtensions.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Seo;
using Grand.SharedKernel.Extensions;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class SeoExtensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ShippingExtensions.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ShippingExtensions.cs
index 0620fd157..0ef281180 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShippingExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ShippingExtensions.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class ShippingExtensions
{
diff --git a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs b/src/Business/Grand.Business.Core/Extensions/ShoppingCartExtensions.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/ShoppingCartExtensions.cs
index 6dc6e8c31..6441c7e90 100644
--- a/src/Business/Grand.Business.Checkout/Extensions/ShoppingCartExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/ShoppingCartExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Represents a shopping cart
diff --git a/src/Business/Grand.Business.Storage/Extensions/Extensions.cs b/src/Business/Grand.Business.Core/Extensions/StorageExtensions.cs
similarity index 95%
rename from src/Business/Grand.Business.Storage/Extensions/Extensions.cs
rename to src/Business/Grand.Business.Core/Extensions/StorageExtensions.cs
index 1a55347d0..2b3f8d025 100644
--- a/src/Business/Grand.Business.Storage/Extensions/Extensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/StorageExtensions.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Http;
-namespace Grand.Business.Storage.Extensions
+namespace Grand.Business.Core.Extensions
{
/// <summary>
/// Extensions
diff --git a/src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs b/src/Business/Grand.Business.Core/Extensions/TierPriceExtensions.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/TierPriceExtensions.cs
index 8e6e7178d..b3cadba6b 100644
--- a/src/Business/Grand.Business.Catalog/Extensions/TierPriceExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/TierPriceExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
-namespace Grand.Business.Catalog.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class TierPriceExtensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs b/src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs
similarity index 99%
rename from src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs
index f1e361e5e..0a0aa84d5 100644
--- a/src/Business/Grand.Business.Common/Extensions/TranslateExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/TranslateExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain;
using Grand.Domain.Localization;
using Grand.Domain.Permissions;
@@ -8,7 +8,7 @@ using Grand.SharedKernel.Extensions;
using System.Linq.Expressions;
using System.Reflection;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class TranslateExtensions
{
diff --git a/src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs b/src/Business/Grand.Business.Core/Extensions/UserFieldExtensions.cs
similarity index 90%
rename from src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs
rename to src/Business/Grand.Business.Core/Extensions/UserFieldExtensions.cs
index 9cdc047be..0e130f3e0 100644
--- a/src/Business/Grand.Business.Common/Extensions/UserFieldExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/UserFieldExtensions.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain;
-namespace Grand.Business.Common.Extensions
+namespace Grand.Business.Core.Extensions
{
public static class UserFieldExtensions
{
diff --git a/src/Business/Grand.Business.Core/Grand.Business.Core.csproj b/src/Business/Grand.Business.Core/Grand.Business.Core.csproj
new file mode 100644
index 000000000..5d931b0d3
--- /dev/null
+++ b/src/Business/Grand.Business.Core/Grand.Business.Core.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" />
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
+ </ItemGroup>
+</Project>
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IApiAuthenticationService.cs
similarity index 83%
rename from src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IApiAuthenticationService.cs
index 2a97b473e..830cf3dd5 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IApiAuthenticationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IApiAuthenticationService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
public partial interface IApiAuthenticationService
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IAuthenticationBuilder.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IAuthenticationBuilder.cs
similarity index 91%
rename from src/Business/Grand.Business.Authentication/Interfaces/IAuthenticationBuilder.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IAuthenticationBuilder.cs
index d94878a07..e1a4c02ba 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IAuthenticationBuilder.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IAuthenticationBuilder.cs
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.Configuration;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
/// <summary>
/// Interface to add authentication
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IExternalAuthenticationProvider.cs
similarity index 89%
rename from src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IExternalAuthenticationProvider.cs
index 50b51256d..d340f3dc4 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IExternalAuthenticationProvider.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Plugins;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
/// <summary>
/// Represents method for the external authentication
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IExternalAuthenticationService.cs
similarity index 96%
rename from src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IExternalAuthenticationService.cs
index 0bdb05971..fafb5a085 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IExternalAuthenticationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IExternalAuthenticationService.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Authentication.Utilities;
+using Grand.Business.Core.Utilities.Authentication;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Microsoft.AspNetCore.Mvc;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
/// <summary>
/// External authentication service
@@ -70,9 +70,9 @@ namespace Grand.Business.Authentication.Interfaces
/// <returns>Customer</returns>
Task<Customer> GetCustomer(ExternalAuthParam parameters);
-
+
Task<IList<ExternalAuthentication>> GetExternalIdentifiers(Customer customer);
-
+
/// <summary>
/// Delete the external authentication
/// </summary>
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IGrandAuthenticationService.cs
similarity index 95%
rename from src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IGrandAuthenticationService.cs
index a3411cb81..aa89b70f0 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IGrandAuthenticationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IGrandAuthenticationService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
/// <summary>
/// Authentication service interface
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IJwtBearerAuthenticationService.cs
similarity index 88%
rename from src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IJwtBearerAuthenticationService.cs
index 8848694c4..c42bc34bd 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IJwtBearerAuthenticationService.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Authentication.JwtBearer;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
public interface IJwtBearerAuthenticationService
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IJwtBearerCustomerAuthenticationService.cs
similarity index 80%
rename from src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IJwtBearerCustomerAuthenticationService.cs
index f28e26f92..b4f24d95a 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IJwtBearerCustomerAuthenticationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IJwtBearerCustomerAuthenticationService.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Authentication.JwtBearer;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
public interface IJwtBearerCustomerAuthenticationService
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/IRefreshTokenService.cs
similarity index 88%
rename from src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/IRefreshTokenService.cs
index bbe907d21..5d281f11f 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/IRefreshTokenService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/IRefreshTokenService.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Security;
using System.Security.Claims;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
public interface IRefreshTokenService
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/ISMSVerificationService.cs
similarity index 73%
rename from src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/ISMSVerificationService.cs
index bf1abe7ae..72c63bf8f 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/ISMSVerificationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/ISMSVerificationService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Authentication.Utilities;
+using Grand.Business.Core.Utilities.Authentication;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
public interface ISMSVerificationService
{
diff --git a/src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs b/src/Business/Grand.Business.Core/Interfaces/Authentication/ITwoFactorAuthenticationService.cs
similarity index 80%
rename from src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Authentication/ITwoFactorAuthenticationService.cs
index 45d6e85a4..f46612686 100644
--- a/src/Business/Grand.Business.Authentication/Interfaces/ITwoFactorAuthenticationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Authentication/ITwoFactorAuthenticationService.cs
@@ -1,14 +1,14 @@
-using Grand.Business.Authentication.Utilities;
+using Grand.Business.Core.Utilities.Authentication;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-namespace Grand.Business.Authentication.Interfaces
+namespace Grand.Business.Core.Interfaces.Authentication
{
public interface ITwoFactorAuthenticationService
{
Task<bool> AuthenticateTwoFactor(string secretKey, string token, Customer customer, TwoFactorAuthenticationType twoFactorAuthenticationType);
Task<TwoFactorCodeSetup> GenerateCodeSetup(string secretKey, Customer customer, Language language, TwoFactorAuthenticationType twoFactorAuthenticationType);
-
+
}
}
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Brands/IBrandLayoutService.cs
similarity index 95%
rename from src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Brands/IBrandLayoutService.cs
index 5ea0cf9fb..cc72da63b 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandLayoutService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Brands/IBrandLayoutService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Brands
+namespace Grand.Business.Core.Interfaces.Catalog.Brands
{
public partial interface IBrandLayoutService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Brands/IBrandService.cs
similarity index 96%
rename from src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Brands/IBrandService.cs
index 98dcab1ed..eda627b1b 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Brands/IBrandService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Brands/IBrandService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Brands
+namespace Grand.Business.Core.Interfaces.Catalog.Brands
{
/// <summary>
/// Brand service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/ICategoryLayoutService.cs
similarity index 95%
rename from src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/ICategoryLayoutService.cs
index 67cc97346..79b8b8498 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryLayoutService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/ICategoryLayoutService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Categories
+namespace Grand.Business.Core.Interfaces.Catalog.Categories
{
public partial interface ICategoryLayoutService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/ICategoryService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/ICategoryService.cs
index 6c4e470cb..4c587b419 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Categories/ICategoryService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/ICategoryService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Categories
+namespace Grand.Business.Core.Interfaces.Catalog.Categories
{
public partial interface ICategoryService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/IProductCategoryService.cs
similarity index 93%
rename from src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/IProductCategoryService.cs
index 88ef165db..1175c9404 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Categories/IProductCategoryService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Categories/IProductCategoryService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Categories
+namespace Grand.Business.Core.Interfaces.Catalog.Categories
{
public interface IProductCategoryService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/ICollectionLayoutService.cs
similarity index 95%
rename from src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/ICollectionLayoutService.cs
index a09b1fe89..b440cc64f 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionLayoutService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/ICollectionLayoutService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Collections
+namespace Grand.Business.Core.Interfaces.Catalog.Collections
{
public partial interface ICollectionLayoutService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/ICollectionService.cs
similarity index 97%
rename from src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/ICollectionService.cs
index b4d94f9a3..3464de6c8 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/ICollectionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/ICollectionService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Collections
+namespace Grand.Business.Core.Interfaces.Catalog.Collections
{
/// <summary>
/// Collection service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/IProductCollectionService.cs
similarity index 94%
rename from src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/IProductCollectionService.cs
index 9996f56d9..130ecc9f4 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Collections/IProductCollectionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Collections/IProductCollectionService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Collections
+namespace Grand.Business.Core.Interfaces.Catalog.Collections
{
public interface IProductCollectionService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Directory/IGeoLookupService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/IGeoLookupService.cs
similarity index 90%
rename from src/Business/Grand.Business.Catalog/Interfaces/Directory/IGeoLookupService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/IGeoLookupService.cs
index 161baab03..f833f09d3 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Directory/IGeoLookupService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/IGeoLookupService.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Catalog.Directory
{
/// <summary>
/// GEO lookup service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Directory/IMeasureService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/IMeasureService.cs
similarity index 99%
rename from src/Business/Grand.Business.Catalog/Interfaces/Directory/IMeasureService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/IMeasureService.cs
index 81c615757..ba878ff87 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Directory/IMeasureService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/IMeasureService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Directory;
-namespace Grand.Business.Catalog.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Catalog.Directory
{
/// <summary>
/// Measure dimension service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Directory/ISearchTermService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/ISearchTermService.cs
similarity index 94%
rename from src/Business/Grand.Business.Catalog/Interfaces/Directory/ISearchTermService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/ISearchTermService.cs
index a02099f9d..f051aac36 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Directory/ISearchTermService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Directory/ISearchTermService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Common;
-namespace Grand.Business.Catalog.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Catalog.Directory
{
/// <summary>
/// Search term service interafce
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountAmountProvider.cs
similarity index 84%
rename from src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountAmountProvider.cs
index d0a2fde09..3ef0cc2c4 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountAmountProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountAmountProvider.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Discounts;
using Grand.Infrastructure.Plugins;
-namespace Grand.Business.Catalog.Interfaces.Discounts
+namespace Grand.Business.Core.Interfaces.Catalog.Discounts
{
public partial interface IDiscountAmountProvider : IProvider
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountProvider.cs
similarity index 73%
rename from src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountProvider.cs
index 4a611ff08..c933351a2 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountProvider.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Plugins;
-namespace Grand.Business.Catalog.Interfaces.Discounts
+namespace Grand.Business.Core.Interfaces.Catalog.Discounts
{
public partial interface IDiscountProvider : IProvider
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountRule.cs
similarity index 90%
rename from src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountRule.cs
index 0140fecd4..c46dd35e2 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountRule.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountRule.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Discounts
+namespace Grand.Business.Core.Interfaces.Catalog.Discounts
{
public partial interface IDiscountRule
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.cs
index 7a75a4139..f38b966c2 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Discounts/IDiscountService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Discounts/IDiscountService.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Discounts;
-namespace Grand.Business.Catalog.Interfaces.Discounts
+namespace Grand.Business.Core.Interfaces.Catalog.Discounts
{
/// <summary>
/// Discount service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Prices/IPriceFormatter.cs
similarity index 99%
rename from src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Prices/IPriceFormatter.cs
index 7fa95df3b..69e45712a 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPriceFormatter.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Prices/IPriceFormatter.cs
@@ -2,7 +2,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Domain.Localization;
-namespace Grand.Business.Catalog.Interfaces.Prices
+namespace Grand.Business.Core.Interfaces.Catalog.Prices
{
public partial interface IPriceFormatter
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Prices/IPricingService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Prices/IPricingService.cs
index d0f7b5f1d..399a2b714 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Prices/IPricingService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Prices/IPricingService.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
-namespace Grand.Business.Catalog.Interfaces.Prices
+namespace Grand.Business.Core.Interfaces.Catalog.Prices
{
/// <summary>
/// Price calculation service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IAuctionService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IAuctionService.cs
index 2da4a83ff..125973514 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IAuctionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IAuctionService.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Auction service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.cs
similarity index 94%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.cs
index ec0d25ff6..043afbe3f 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICopyProductService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICopyProductService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Copy product service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICustomerGroupProductService.cs
similarity index 96%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICustomerGroupProductService.cs
index 09d1f540c..0c66b40f3 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/ICustomerGroupProductService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ICustomerGroupProductService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
public interface ICustomerGroupProductService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IInventoryManageService.cs
similarity index 96%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IInventoryManageService.cs
index ab7f0b59c..f6c994cc4 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IInventoryManageService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IInventoryManageService.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Common;
using Grand.Domain.Shipping;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
public interface IInventoryManageService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IOutOfStockSubscriptionService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IOutOfStockSubscriptionService.cs
index b36b04351..d029dbf2c 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IOutOfStockSubscriptionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IOutOfStockSubscriptionService.cs
@@ -2,7 +2,7 @@ using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Out of stock subscription service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeFormatter.cs
similarity index 96%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeFormatter.cs
index c1e174525..d94c4c1ae 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeFormatter.cs
@@ -2,7 +2,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product attribute formatter interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeParser.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeParser.cs
index 4d1d290f0..c6de12bb8 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeParser.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeParser.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product attribute parser interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.cs
similarity index 99%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.cs
index fc6565be6..55398e436 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductAttributeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductAttributeService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product attribute service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductCourseService.cs
similarity index 84%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductCourseService.cs
index 6a599c066..7c9a63f1b 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductCourseService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductCourseService.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Courses;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
public interface IProductCourseService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductLayoutService.cs
similarity index 95%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductLayoutService.cs
index c7a838873..d116b2eb8 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductLayoutService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductLayoutService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product layout interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductReservationService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductReservationService.cs
index ee09bd00d..116053cf0 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReservationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductReservationService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product reservation service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductReviewService.cs
similarity index 97%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductReviewService.cs
index ef9d580db..f0c0021c7 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductReviewService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductReviewService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product review service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.cs
similarity index 99%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.cs
index 2892f22a0..d3c0479da 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductService.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductTagService.cs
similarity index 97%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductTagService.cs
index 9c0f4a83a..0233d492e 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IProductTagService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IProductTagService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Product tag service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IRecentlyViewedProductsService.cs
similarity index 92%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IRecentlyViewedProductsService.cs
index 7ba76f0c6..699bb4a50 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IRecentlyViewedProductsService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IRecentlyViewedProductsService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Recently viewed products service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.cs
index 62d145496..8c5dfbd53 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/ISpecificationAttributeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/ISpecificationAttributeService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
/// <summary>
/// Specification attribute service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IStockQuantityService.cs
similarity index 90%
rename from src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IStockQuantityService.cs
index f93f1da9f..bdc9ad712 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Products/IStockQuantityService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Products/IStockQuantityService.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-namespace Grand.Business.Catalog.Interfaces.Products
+namespace Grand.Business.Core.Interfaces.Catalog.Products
{
public interface IStockQuantityService
{
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxCategoryService.cs
similarity index 95%
rename from src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxCategoryService.cs
index eacf764bc..ac7b03299 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxCategoryService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxCategoryService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Tax;
-namespace Grand.Business.Catalog.Interfaces.Tax
+namespace Grand.Business.Core.Interfaces.Catalog.Tax
{
/// <summary>
/// Tax category service interface
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxProvider.cs
similarity index 82%
rename from src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxProvider.cs
index 7a71f8f10..d8d62114b 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxProvider.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Infrastructure.Plugins;
-namespace Grand.Business.Catalog.Interfaces.Tax
+namespace Grand.Business.Core.Interfaces.Catalog.Tax
{
/// <summary>
/// Provides an interface for creating tax providers
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxService.cs
similarity index 98%
rename from src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxService.cs
index 3c9a13781..fb55a348b 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/ITaxService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/ITaxService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Services.Tax;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-namespace Grand.Business.Catalog.Interfaces.Tax
+namespace Grand.Business.Core.Interfaces.Catalog.Tax
{
/// <summary>
/// Tax service
diff --git a/src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/IVatService.cs
similarity index 94%
rename from src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/IVatService.cs
index d95ba3b50..2b73d726a 100644
--- a/src/Business/Grand.Business.Catalog/Interfaces/Tax/IVatService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Catalog/Tax/IVatService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain.Tax;
-namespace Grand.Business.Catalog.Interfaces.Tax
+namespace Grand.Business.Core.Interfaces.Catalog.Tax
{
public interface IVatService
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeFormatter.cs
similarity index 93%
rename from src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeFormatter.cs
index eb63b840f..4b2194c8c 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeFormatter.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeFormatter.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
-namespace Grand.Business.Checkout.Interfaces.CheckoutAttributes
+namespace Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes
{
/// <summary>
/// Checkout attribute helper
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeParser.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeParser.cs
index 54c9cd87f..0d20be2a0 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeParser.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeParser.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.CheckoutAttributes
+namespace Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes
{
/// <summary>
/// Checkout attribute parser interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeService.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeService.cs
index f73697088..159146164 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/CheckoutAttributes/ICheckoutAttributeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/CheckoutAttributes/ICheckoutAttributeService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.CheckoutAttributes
+namespace Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes
{
/// <summary>
/// Checkout attribute service
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/GiftVouchers/IGiftVoucherService.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/GiftVouchers/IGiftVoucherService.cs
index e19babefe..148bfe20d 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/GiftVouchers/IGiftVoucherService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/GiftVouchers/IGiftVoucherService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.GiftVouchers
+namespace Grand.Business.Core.Interfaces.Checkout.GiftVouchers
{
/// <summary>
/// Gift voucher service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/ILoyaltyPointsService.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/ILoyaltyPointsService.cs
index 6f61ff155..4c2aab69e 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/ILoyaltyPointsService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/ILoyaltyPointsService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
/// <summary>
/// LoyaltyPoints service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs
similarity index 99%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs
index ee8527ae0..eea57ba8e 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IMerchandiseReturnService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IMerchandiseReturnService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
/// <summary>
/// Merchandise return service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderCalculationService.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderCalculationService.cs
index 57aec4a06..5add013a2 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderCalculationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderCalculationService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
/// <summary>
/// Order service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderService.cs
similarity index 99%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderService.cs
index a694a9322..bd970dd57 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderService.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
/// <summary>
/// Order service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderStatusService.cs
similarity index 86%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderStatusService.cs
index 9bdda7abf..17b14fa89 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderStatusService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderStatusService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
public interface IOrderStatusService
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderTagService.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderTagService.cs
index 1b5142bc0..574b1ff49 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IOrderTagService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IOrderTagService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
/// <summary>
/// Order's tag service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IShoppingCartService.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IShoppingCartService.cs
index abe9c76d6..9ef5117c0 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IShoppingCartService.cs
@@ -1,16 +1,16 @@
-using Grand.Business.Checkout.Services.Orders;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
/// <summary>
/// Shopping cart service
/// </summary>
public partial interface IShoppingCartService
{
-
+
/// <summary>
/// Gets shopping cart
/// </summary>
@@ -62,7 +62,7 @@ namespace Grand.Business.Checkout.Interfaces.Orders
ShoppingCartType shoppingCartType, string storeId, string warehouseId = null, IList<CustomAttribute> attributes = null,
double? customerEnteredPrice = null,
DateTime? rentalStartDate = null, DateTime? rentalEndDate = null,
- int quantity = 1,
+ int quantity = 1,
bool automaticallyAddRequiredProductsIfEnabled = true, string reservationId = "", string parameter = "", string duration = "",
ShoppingCartValidatorOptions validator = null);
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IShoppingCartValidator.cs
similarity index 98%
rename from src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IShoppingCartValidator.cs
index d9b0c8598..8ebda3d06 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Orders/IShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Orders/IShoppingCartValidator.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Services.Orders;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Interfaces.Orders
+namespace Grand.Business.Core.Interfaces.Checkout.Orders
{
public interface IShoppingCartValidator
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
index 9e7cb840b..0562d628e 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentProvider.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Infrastructure.Plugins;
using Grand.Domain.Orders;
using Microsoft.AspNetCore.Http;
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Interfaces.Payments
+namespace Grand.Business.Core.Interfaces.Checkout.Payments
{
/// <summary>
/// Provides an interface for creating payment gateways & methods
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs
similarity index 98%
rename from src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs
index bf8d5f8e7..2c31af918 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Interfaces.Payments
+namespace Grand.Business.Core.Interfaces.Checkout.Payments
{
/// <summary>
/// Payment service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentTransactionService.cs
similarity index 98%
rename from src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentTransactionService.cs
index e284221c3..05295dcbd 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Payments/IPaymentTransactionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Payments/IPaymentTransactionService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Interfaces.Payments
+namespace Grand.Business.Core.Interfaces.Checkout.Payments
{
public interface IPaymentTransactionService
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IDeliveryDateService.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IDeliveryDateService.cs
index cf16ba1c8..94912de55 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IDeliveryDateService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IDeliveryDateService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
public interface IDeliveryDateService
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IPickupPointService.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IPickupPointService.cs
index a689a7110..df2348b75 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IPickupPointService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IPickupPointService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
public interface IPickupPointService
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShipmentService.cs
similarity index 98%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShipmentService.cs
index a45242587..dfacfea9d 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShipmentService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
/// <summary>
/// Shipment service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShipmentTracker.cs
similarity index 91%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShipmentTracker.cs
index 307597844..800679169 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShipmentTracker.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShipmentTracker.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Enum;
+using Grand.Business.Core.Enums.Checkout;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
/// <summary>
/// Shipment tracker
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingMethodService.cs
similarity index 95%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingMethodService.cs
index 234b59587..838dd8bc2 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingMethodService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingMethodService.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
public interface IShippingMethodService
{
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs
similarity index 93%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs
index 8eb16582d..2e5be26e1 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingRateCalculationProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingRateCalculationProvider.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Infrastructure.Plugins;
using Grand.Domain.Orders;
using Microsoft.AspNetCore.Http;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
/// <summary>
/// Provides an interface of Shipping rate method
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingService.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingService.cs
index 5fbae20fe..36b93fe6e 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IShippingService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IShippingService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Utilities;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Stores;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
/// <summary>
/// Shipping service interface
diff --git a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IWarehouseService.cs
similarity index 94%
rename from src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IWarehouseService.cs
index df3a6ee87..14ef614f8 100644
--- a/src/Business/Grand.Business.Checkout/Interfaces/Shipping/IWarehouseService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Checkout/Shipping/IWarehouseService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Interfaces.Shipping
+namespace Grand.Business.Core.Interfaces.Checkout.Shipping
{
public interface IWarehouseService
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IBlogService.cs
similarity index 99%
rename from src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IBlogService.cs
index caacbf4de..6dcb249c0 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IBlogService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IBlogService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Blogs;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
/// <summary>
/// Blog service interface
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IConsentCookie.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IConsentCookie.cs
similarity index 84%
rename from src/Business/Grand.Business.Cms/Interfaces/IConsentCookie.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IConsentCookie.cs
index 87c2f0c27..51560770a 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IConsentCookie.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IConsentCookie.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
public interface IConsentCookie
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/ICookiePreference.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/ICookiePreference.cs
similarity index 84%
rename from src/Business/Grand.Business.Cms/Interfaces/ICookiePreference.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/ICookiePreference.cs
index 5a9f59aa4..156197c61 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/ICookiePreference.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/ICookiePreference.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
public interface ICookiePreference
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/INewsService.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/INewsService.cs
similarity index 97%
rename from src/Business/Grand.Business.Cms/Interfaces/INewsService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/INewsService.cs
index 21428808d..8194a9680 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/INewsService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/INewsService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.News;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
/// <summary>
/// News service interface
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IPageLayoutService.cs
similarity index 96%
rename from src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IPageLayoutService.cs
index 261b5495e..946d0e1f6 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IPageLayoutService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IPageLayoutService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Pages;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
/// <summary>
/// Page layout service interface
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IPageService.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IPageService.cs
similarity index 97%
rename from src/Business/Grand.Business.Cms/Interfaces/IPageService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IPageService.cs
index da2eb4754..1db28a7c7 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IPageService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IPageService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Pages;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
/// <summary>
/// Page service interface
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IRobotsTxtService.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IRobotsTxtService.cs
similarity index 95%
rename from src/Business/Grand.Business.Cms/Interfaces/IRobotsTxtService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IRobotsTxtService.cs
index 4ac3fa849..64ec1c5f1 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IRobotsTxtService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IRobotsTxtService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Common;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
public partial interface IRobotsTxtService
{
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IWidgetProvider.cs
similarity index 92%
rename from src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IWidgetProvider.cs
index 5772ea44e..34efea5a6 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IWidgetProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IWidgetProvider.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Plugins;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
/// <summary>
/// Provides an interface for creating widgets
diff --git a/src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs b/src/Business/Grand.Business.Core/Interfaces/Cms/IWidgetService.cs
similarity index 97%
rename from src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Cms/IWidgetService.cs
index 00f6342fc..8f8339a5a 100644
--- a/src/Business/Grand.Business.Cms/Interfaces/IWidgetService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Cms/IWidgetService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Cms.Interfaces
+namespace Grand.Business.Core.Interfaces.Cms
{
/// <summary>
/// Widget service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Addresses/IAddressAttributeParser.cs
similarity index 97%
rename from src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Addresses/IAddressAttributeParser.cs
index 3b55ad950..b75b7b791 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeParser.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Addresses/IAddressAttributeParser.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Domain.Localization;
-namespace Grand.Business.Common.Interfaces.Addresses
+namespace Grand.Business.Core.Interfaces.Common.Addresses
{
/// <summary>
/// Address attribute parser interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Addresses/IAddressAttributeService.cs
similarity index 97%
rename from src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Addresses/IAddressAttributeService.cs
index 525f9723e..c31a35776 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Addresses/IAddressAttributeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Addresses/IAddressAttributeService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Common;
-namespace Grand.Business.Common.Interfaces.Addresses
+namespace Grand.Business.Core.Interfaces.Common.Addresses
{
/// <summary>
/// Address attribute service
diff --git a/src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs
index dcb8dec12..1db94344f 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Configuration/ISettingService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Configuration/ISettingService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Configuration;
-namespace Grand.Business.Common.Interfaces.Configuration
+namespace Grand.Business.Core.Interfaces.Common.Configuration
{
/// <summary>
/// Setting service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/ICountryService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/ICountryService.cs
index 29cc2d121..0d14002ff 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ICountryService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/ICountryService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Directory;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
/// <summary>
/// Country service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/ICurrencyService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/ICurrencyService.cs
index 10e65a03c..1be515973 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/ICurrencyService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/ICurrencyService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Directory;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
/// <summary>
/// Currency service
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IDateTimeService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/IDateTimeService.cs
index 6e4437075..eafefe5d1 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IDateTimeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IDateTimeService.cs
@@ -1,6 +1,6 @@
using System.Collections.ObjectModel;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
/// <summary>
/// Represents a datetime service
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IExchangeRateService.cs
similarity index 90%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/IExchangeRateService.cs
index bcc64d7ee..a1a9493ca 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IExchangeRateService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IExchangeRateService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Providers;
+using Grand.Business.Core.Interfaces.Common.Providers;
using Grand.Domain.Directory;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
public interface IExchangeRateService
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IGroupService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/IGroupService.cs
index 214d97261..117b522ef 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IGroupService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IGroupService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Customers;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
public interface IGroupService
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IHistoryService.cs
similarity index 87%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/IHistoryService.cs
index db0c30ba9..a3790600a 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IHistoryService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IHistoryService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.History;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
/// <summary>
/// History service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IUserFieldService.cs
similarity index 89%
rename from src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Directory/IUserFieldService.cs
index 890bd363b..b4c7d3665 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Directory/IUserFieldService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Directory/IUserFieldService.cs
@@ -1,6 +1,6 @@
using Grand.Domain;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Business.Core.Interfaces.Common.Directory
{
/// <summary>
/// User fields service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Localization/ILanguageService.cs
similarity index 96%
rename from src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Localization/ILanguageService.cs
index 082ed345b..43a2aaafd 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Localization/ILanguageService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Localization/ILanguageService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
-namespace Grand.Business.Common.Interfaces.Localization
+namespace Grand.Business.Core.Interfaces.Common.Localization
{
/// <summary>
/// Language service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Localization/ITranslationService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Localization/ITranslationService.cs
index 8f405bb25..c4a6bcb77 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Localization/ITranslationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Localization/ITranslationService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
-namespace Grand.Business.Common.Interfaces.Localization
+namespace Grand.Business.Core.Interfaces.Common.Localization
{
/// <summary>
/// Translation manager interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Logging/IActivityKeywordsProvider.cs
similarity index 87%
rename from src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Logging/IActivityKeywordsProvider.cs
index 765183462..245d60aab 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Logging/IActivityKeywordsProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Logging/IActivityKeywordsProvider.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Common.Interfaces.Logging
+namespace Grand.Business.Core.Interfaces.Common.Logging
{
public partial interface IActivityKeywordsProvider
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Logging/ICustomerActivityService.cs
similarity index 99%
rename from src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Logging/ICustomerActivityService.cs
index 85dae7318..1a3c16903 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Logging/ICustomerActivityService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Logging/ICustomerActivityService.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Logging;
-namespace Grand.Business.Common.Interfaces.Logging
+namespace Grand.Business.Core.Interfaces.Common.Logging
{
/// <summary>
/// Customer activity service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Logging/ILogger.cs
similarity index 97%
rename from src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Logging/ILogger.cs
index 875610e62..0c3dfa28d 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Logging/ILogger.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Logging/ILogger.cs
@@ -2,7 +2,7 @@ using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Logging;
-namespace Grand.Business.Common.Interfaces.Logging
+namespace Grand.Business.Core.Interfaces.Common.Logging
{
/// <summary>
/// Logger interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Pdf/IPdfService.cs
similarity index 97%
rename from src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Pdf/IPdfService.cs
index 9dbadefe8..01d255207 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Pdf/IPdfService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Pdf/IPdfService.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
-namespace Grand.Business.Common.Interfaces.Pdf
+namespace Grand.Business.Core.Interfaces.Common.Pdf
{
/// <summary>
/// Customer service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Pdf/IViewRenderService.cs
similarity index 78%
rename from src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Pdf/IViewRenderService.cs
index 98663b253..5570b3f79 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Pdf/IViewRenderService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Pdf/IViewRenderService.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Common.Interfaces.Pdf
+namespace Grand.Business.Core.Interfaces.Common.Pdf
{
/// <summary>
/// Allow render rezor view as string
diff --git a/src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Providers/IExchangeRateProvider.cs
similarity index 89%
rename from src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Providers/IExchangeRateProvider.cs
index 4ee881044..3e71b8948 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Providers/IExchangeRateProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Providers/IExchangeRateProvider.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Directory;
using Grand.Infrastructure.Plugins;
-namespace Grand.Business.Common.Interfaces.Providers
+namespace Grand.Business.Core.Interfaces.Common.Providers
{
/// <summary>
/// Exchange rate provider interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Security/IAclService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IAclService.cs
similarity index 94%
rename from src/Business/Grand.Business.Common/Interfaces/Security/IAclService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Security/IAclService.cs
index 606917f87..4449e2279 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Security/IAclService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IAclService.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Permissions;
using Grand.Domain.Stores;
-namespace Grand.Business.Common.Interfaces.Security
+namespace Grand.Business.Core.Interfaces.Common.Security
{
/// <summary>
/// ACL service inerface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Security/IEncryptionService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IEncryptionService.cs
similarity index 96%
rename from src/Business/Grand.Business.Common/Interfaces/Security/IEncryptionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Security/IEncryptionService.cs
index e4282598c..22527a9a6 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Security/IEncryptionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IEncryptionService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Common.Interfaces.Security
+namespace Grand.Business.Core.Interfaces.Common.Security
{
public interface IEncryptionService
{
diff --git a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IPermissionProvider.cs
similarity index 90%
rename from src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Security/IPermissionProvider.cs
index 7e8b598d6..4801ce7b3 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IPermissionProvider.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Interfaces.Security
+namespace Grand.Business.Core.Interfaces.Common.Security
{
/// <summary>
/// Permission provider
diff --git a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IPermissionService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Security/IPermissionService.cs
index 464459d86..a72c096fb 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Security/IPermissionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Security/IPermissionService.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Interfaces.Security
+namespace Grand.Business.Core.Interfaces.Common.Security
{
/// <summary>
/// Permission service interface
diff --git a/src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISlugService.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISlugService.cs
index 595110308..513732533 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Seo/ISlugService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Seo/ISlugService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Seo;
-namespace Grand.Business.Common.Interfaces.Seo
+namespace Grand.Business.Core.Interfaces.Common.Seo
{
/// <summary>
/// Provides information about URL Entity
diff --git a/src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs b/src/Business/Grand.Business.Core/Interfaces/Common/Stores/IStoreService.cs
similarity index 95%
rename from src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Common/Stores/IStoreService.cs
index c5fda0e38..525e8f906 100644
--- a/src/Business/Grand.Business.Common/Interfaces/Stores/IStoreService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Common/Stores/IStoreService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Stores;
-namespace Grand.Business.Common.Interfaces.Stores
+namespace Grand.Business.Core.Interfaces.Common.Stores
{
/// <summary>
/// Store service interface
diff --git a/src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/IAffiliateService.cs
similarity index 97%
rename from src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/IAffiliateService.cs
index a5a0af191..af173fc6b 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/IAffiliateService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/IAffiliateService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Affiliates;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
/// <summary>
/// Affiliate service interface
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerAttributeParser.cs
similarity index 97%
rename from src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerAttributeParser.cs
index fa34d8d89..0b3693d01 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeParser.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerAttributeParser.cs
@@ -2,7 +2,7 @@ using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
/// <summary>
/// Customer attribute parser interface
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerAttributeService.cs
similarity index 97%
rename from src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerAttributeService.cs
index 4c0b97960..e6bdbaf0b 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerAttributeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerAttributeService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
/// <summary>
/// Customer attribute service
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerHistoryPasswordService.cs
similarity index 94%
rename from src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerHistoryPasswordService.cs
index cfa8cd40a..3babee8e9 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerHistoryPasswordService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerHistoryPasswordService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
public interface ICustomerHistoryPasswordService
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerManagerService.cs
similarity index 93%
rename from src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerManagerService.cs
index 81e526398..17917a8a5 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerManagerService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerManagerService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
/// <summary>
/// Customer manager interface
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerNoteService.cs
similarity index 95%
rename from src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerNoteService.cs
index 7af37f0c1..989762fa2 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerNoteService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerNoteService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
public interface ICustomerNoteService
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerService.cs
similarity index 99%
rename from src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerService.cs
index 6373b37c9..92cef172d 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ICustomerService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerService.cs
@@ -5,7 +5,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using System.Linq.Expressions;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
/// <summary>
/// Customer service interface
diff --git a/src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/ISalesEmployeeService.cs
similarity index 95%
rename from src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/ISalesEmployeeService.cs
index 902559bc5..ca163ab73 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/ISalesEmployeeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/ISalesEmployeeService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
public interface ISalesEmployeeService
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/IUserApiService.cs
similarity index 96%
rename from src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/IUserApiService.cs
index db1e6338a..c06252754 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/IUserApiService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/IUserApiService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
public partial interface IUserApiService
{
diff --git a/src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs b/src/Business/Grand.Business.Core/Interfaces/Customers/IVendorService.cs
similarity index 98%
rename from src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Customers/IVendorService.cs
index 75e5ca10c..db324e04b 100644
--- a/src/Business/Grand.Business.Customers/Interfaces/IVendorService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Customers/IVendorService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Vendors;
-namespace Grand.Business.Customers.Interfaces
+namespace Grand.Business.Core.Interfaces.Customers
{
/// <summary>
/// Vendor service interface
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Banners/IBannerService.cs
similarity index 94%
rename from src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Banners/IBannerService.cs
index 36ecad116..3dad561f8 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Banners/IBannerService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Banners/IBannerService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Banners
+namespace Grand.Business.Core.Interfaces.Marketing.Banners
{
public partial interface IBannerService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Campaigns/ICampaignService.cs
similarity index 97%
rename from src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Campaigns/ICampaignService.cs
index d2199060d..b75f8652b 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Campaigns/ICampaignService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Campaigns/ICampaignService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Campaigns
+namespace Grand.Business.Core.Interfaces.Marketing.Campaigns
{
public partial interface ICampaignService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactAttributeParser.cs
similarity index 98%
rename from src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactAttributeParser.cs
index 37f50acff..3e118e49e 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeParser.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactAttributeParser.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Contacts
+namespace Grand.Business.Core.Interfaces.Marketing.Contacts
{
/// <summary>
/// Contact attribute parser interface
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactAttributeService.cs
similarity index 96%
rename from src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactAttributeService.cs
index 51c6e41a8..13f103fb9 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactAttributeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactAttributeService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Contacts
+namespace Grand.Business.Core.Interfaces.Marketing.Contacts
{
/// <summary>
/// Contact attribute service
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactUsService.cs
similarity index 96%
rename from src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactUsService.cs
index 86e176306..877f9995d 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IContactUsService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IContactUsService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Contacts
+namespace Grand.Business.Core.Interfaces.Marketing.Contacts
{
/// <summary>
/// ContactUs interface
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IInteractiveFormService.cs
similarity index 95%
rename from src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IInteractiveFormService.cs
index a8d74f0e9..235b42ecb 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IInteractiveFormService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IInteractiveFormService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Contacts
+namespace Grand.Business.Core.Interfaces.Marketing.Contacts
{
public partial interface IInteractiveFormService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IPopupService.cs
similarity index 91%
rename from src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IPopupService.cs
index 7d5111aca..7d092ac3d 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Contacts/IPopupService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Contacts/IPopupService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Contacts
+namespace Grand.Business.Core.Interfaces.Marketing.Contacts
{
public partial interface IPopupService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseActionService.cs
similarity index 87%
rename from src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseActionService.cs
index 548222b52..9e33a86d8 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseActionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseActionService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
-namespace Grand.Business.Marketing.Interfaces.Courses
+namespace Grand.Business.Core.Interfaces.Marketing.Courses
{
public interface ICourseActionService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseLessonService.cs
similarity index 86%
rename from src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseLessonService.cs
index 5a8a5ea2c..55b83afc4 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLessonService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseLessonService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
-namespace Grand.Business.Marketing.Interfaces.Courses
+namespace Grand.Business.Core.Interfaces.Marketing.Courses
{
public interface ICourseLessonService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseLevelService.cs
similarity index 85%
rename from src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseLevelService.cs
index ccacd757e..d6c89808e 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseLevelService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseLevelService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
-namespace Grand.Business.Marketing.Interfaces.Courses
+namespace Grand.Business.Core.Interfaces.Marketing.Courses
{
public interface ICourseLevelService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseService.cs
similarity index 88%
rename from src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseService.cs
index 2d868638c..fc6f2e767 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseService.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Courses;
using Grand.Domain.Customers;
-namespace Grand.Business.Marketing.Interfaces.Courses
+namespace Grand.Business.Core.Interfaces.Marketing.Courses
{
public interface ICourseService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseSubjectService.cs
similarity index 86%
rename from src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseSubjectService.cs
index 1795067ef..352ad8b60 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Courses/ICourseSubjectService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Courses/ICourseSubjectService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
-namespace Grand.Business.Marketing.Interfaces.Courses
+namespace Grand.Business.Core.Interfaces.Marketing.Courses
{
public interface ICourseSubjectService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerActionEventService.cs
similarity index 93%
rename from src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerActionEventService.cs
index 9138bbe6b..697bc2944 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionEventService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerActionEventService.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Orders;
-namespace Grand.Business.Marketing.Interfaces.Customers
+namespace Grand.Business.Core.Interfaces.Marketing.Customers
{
public partial interface ICustomerActionEventService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerActionService.cs
similarity index 96%
rename from src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerActionService.cs
index 4e331111a..362453070 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerActionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerActionService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Customers;
-namespace Grand.Business.Marketing.Interfaces.Customers
+namespace Grand.Business.Core.Interfaces.Marketing.Customers
{
public partial interface ICustomerActionService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerCoordinatesService.cs
similarity index 87%
rename from src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerCoordinatesService.cs
index 081a9680f..0875f4892 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerCoordinatesService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerCoordinatesService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Marketing.Interfaces.Customers
+namespace Grand.Business.Core.Interfaces.Marketing.Customers
{
public interface ICustomerCoordinatesService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerProductService.cs
similarity index 98%
rename from src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerProductService.cs
index ec248b182..93c11ab49 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerProductService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerProductService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Customers;
-namespace Grand.Business.Marketing.Interfaces.Customers
+namespace Grand.Business.Core.Interfaces.Marketing.Customers
{
/// <summary>
/// Customer product service interface
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerReminderService.cs
similarity index 94%
rename from src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerReminderService.cs
index a1233704e..81884d8ef 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerReminderService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerReminderService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Marketing.Services.Customers;
+using Grand.Business.Core.Utilities.Marketing;
using Grand.Domain;
using Grand.Domain.Customers;
-namespace Grand.Business.Marketing.Interfaces.Customers
+namespace Grand.Business.Core.Interfaces.Marketing.Customers
{
public partial interface ICustomerReminderService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerTagService.cs
similarity index 98%
rename from src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerTagService.cs
index 2420c000f..b928c02de 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Customers/ICustomerTagService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Customers/ICustomerTagService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Customers;
-namespace Grand.Business.Marketing.Interfaces.Customers
+namespace Grand.Business.Core.Interfaces.Marketing.Customers
{
/// <summary>
/// Product tag service interface
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Documents/IDocumentService.cs
similarity index 95%
rename from src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Documents/IDocumentService.cs
index 391ac72a3..45e5f96ac 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Documents/IDocumentService.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Common;
using Grand.Domain.Documents;
-namespace Grand.Business.Marketing.Interfaces.Documents
+namespace Grand.Business.Core.Interfaces.Marketing.Documents
{
public partial interface IDocumentService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Documents/IDocumentTypeService.cs
similarity index 94%
rename from src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Documents/IDocumentTypeService.cs
index 6fb0c1f18..4adea25ba 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Documents/IDocumentTypeService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Documents/IDocumentTypeService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Documents;
-namespace Grand.Business.Marketing.Interfaces.Documents
+namespace Grand.Business.Core.Interfaces.Marketing.Documents
{
public partial interface IDocumentTypeService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Knowledgebase/IKnowledgebaseService.cs
similarity index 99%
rename from src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Knowledgebase/IKnowledgebaseService.cs
index b3b82c68f..baf839c1d 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Knowledgebase/IKnowledgebaseService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Knowledgebase/IKnowledgebaseService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Knowledgebase;
-namespace Grand.Business.Marketing.Interfaces.Knowledgebase
+namespace Grand.Business.Core.Interfaces.Marketing.Knowledgebase
{
public interface IKnowledgebaseService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Newsletters/INewsLetterSubscriptionService.cs
similarity index 98%
rename from src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Newsletters/INewsLetterSubscriptionService.cs
index d30d574f9..6a6905bf1 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsLetterSubscriptionService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Newsletters/INewsLetterSubscriptionService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Newsletters
+namespace Grand.Business.Core.Interfaces.Marketing.Newsletters
{
/// <summary>
/// Newsletter subscription service interface
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/Newsletters/INewsletterCategoryService.cs
similarity index 96%
rename from src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/Newsletters/INewsletterCategoryService.cs
index d41f11bc0..07f6cfdee 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/Newsletters/INewsletterCategoryService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/Newsletters/INewsletterCategoryService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Marketing.Interfaces.Newsletters
+namespace Grand.Business.Core.Interfaces.Marketing.Newsletters
{
public partial interface INewsletterCategoryService
{
diff --git a/src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs b/src/Business/Grand.Business.Core/Interfaces/Marketing/PushNotifications/IPushNotificationsService.cs
similarity index 97%
rename from src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Marketing/PushNotifications/IPushNotificationsService.cs
index 3f7483e87..f452fd9c2 100644
--- a/src/Business/Grand.Business.Marketing/Interfaces/PushNotifications/IPushNotificationsService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Marketing/PushNotifications/IPushNotificationsService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.PushNotifications;
-namespace Grand.Business.Marketing.Interfaces.PushNotifications
+namespace Grand.Business.Core.Interfaces.Marketing.PushNotifications
{
public interface IPushNotificationsService
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IEmailAccountService.cs
similarity index 95%
rename from src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IEmailAccountService.cs
index 27d0bf6e4..55130752d 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IEmailAccountService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IEmailAccountService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
public partial interface IEmailAccountService
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IEmailSender.cs
similarity index 97%
rename from src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IEmailSender.cs
index a91b4cbb4..160d67558 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IEmailSender.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IEmailSender.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
/// <summary>
/// Email sender
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IMessageProviderService.cs
similarity index 99%
rename from src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IMessageProviderService.cs
index a54442579..23b422cc5 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageProviderService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IMessageProviderService.cs
@@ -10,7 +10,7 @@ using Grand.Domain.Shipping;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
public partial interface IMessageProviderService
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IMessageTemplateService.cs
similarity index 97%
rename from src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IMessageTemplateService.cs
index ca692b55a..92ad81496 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageTemplateService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IMessageTemplateService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Messages;
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
/// <summary>
/// Message template service
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IMessageTokenProvider.cs
similarity index 84%
rename from src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IMessageTokenProvider.cs
index 3b7228636..23fe8932c 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMessageTokenProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IMessageTokenProvider.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
public partial interface IMessageTokenProvider
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IMimeMappingService.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IMimeMappingService.cs
similarity index 65%
rename from src/Business/Grand.Business.Messages/Interfaces/IMimeMappingService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IMimeMappingService.cs
index 61380aa3f..b28bc1255 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IMimeMappingService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IMimeMappingService.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
public partial interface IMimeMappingService
{
diff --git a/src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs b/src/Business/Grand.Business.Core/Interfaces/Messages/IQueuedEmailService.cs
similarity index 98%
rename from src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Messages/IQueuedEmailService.cs
index b0d3ec39c..5aed2a226 100644
--- a/src/Business/Grand.Business.Messages/Interfaces/IQueuedEmailService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Messages/IQueuedEmailService.cs
@@ -1,7 +1,7 @@
using Grand.Domain;
using Grand.Domain.Messages;
-namespace Grand.Business.Messages.Interfaces
+namespace Grand.Business.Core.Interfaces.Messages
{
public partial interface IQueuedEmailService
{
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs b/src/Business/Grand.Business.Core/Interfaces/Storage/IDownloadService.cs
similarity index 96%
rename from src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Storage/IDownloadService.cs
index cd4946b82..d6f7ac151 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IDownloadService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Storage/IDownloadService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Media;
-namespace Grand.Business.Storage.Interfaces
+namespace Grand.Business.Core.Interfaces.Storage
{
/// <summary>
/// Download service interface
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs b/src/Business/Grand.Business.Core/Interfaces/Storage/IFileStore.cs
similarity index 99%
rename from src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs
rename to src/Business/Grand.Business.Core/Interfaces/Storage/IFileStore.cs
index ae3b377cb..c228d8b21 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IFileStore.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Storage/IFileStore.cs
@@ -2,7 +2,7 @@
using Microsoft.Extensions.FileProviders.Physical;
-namespace Grand.Business.Storage.Interfaces
+namespace Grand.Business.Core.Interfaces.Storage
{
/// <summary>
/// Represents a generic abstraction over a virtual file store.
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs b/src/Business/Grand.Business.Core/Interfaces/Storage/IFileStoreEntry.cs
similarity index 96%
rename from src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs
rename to src/Business/Grand.Business.Core/Interfaces/Storage/IFileStoreEntry.cs
index c4a1ecefc..98918c387 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IFileStoreEntry.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Storage/IFileStoreEntry.cs
@@ -1,6 +1,6 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
-namespace Grand.Business.Storage.Interfaces
+namespace Grand.Business.Core.Interfaces.Storage
{
public interface IFileStoreEntry
{
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IMediaFileStore.cs b/src/Business/Grand.Business.Core/Interfaces/Storage/IMediaFileStore.cs
similarity index 86%
rename from src/Business/Grand.Business.Storage/Interfaces/IMediaFileStore.cs
rename to src/Business/Grand.Business.Core/Interfaces/Storage/IMediaFileStore.cs
index 0cd408cdf..f9e02d15e 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IMediaFileStore.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Storage/IMediaFileStore.cs
@@ -1,6 +1,6 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
-namespace Grand.Business.Storage.Interfaces
+namespace Grand.Business.Core.Interfaces.Storage
{
/// <summary>
/// Represents an abstraction over a specialized file store for storing media and service it to clients.
diff --git a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs b/src/Business/Grand.Business.Core/Interfaces/Storage/IPictureService.cs
similarity index 94%
rename from src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
rename to src/Business/Grand.Business.Core/Interfaces/Storage/IPictureService.cs
index 3cff5ef0a..5c87dd3ba 100644
--- a/src/Business/Grand.Business.Storage/Interfaces/IPictureService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/Storage/IPictureService.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Common;
using Grand.Domain.Media;
using System.Linq.Expressions;
-namespace Grand.Business.Storage.Interfaces
+namespace Grand.Business.Core.Interfaces.Storage
{
/// <summary>
/// Picture service interface
@@ -181,5 +181,13 @@ namespace Grand.Business.Storage.Interfaces
/// <returns>Picture binary or throws an exception</returns>
byte[] ValidatePicture(byte[] pictureBinary, string mimeType);
+ /// <summary>
+ /// Convert picture
+ /// </summary>
+ /// <param name="pictureBinary">Picture binary</param>
+ /// <param name="imageQuality">Image quality</param>
+ /// <param name="format">Format</param>
+ /// <returns>Picture binary or throws an exception</returns>
+ byte[] ConvertPicture(byte[] pictureBinary, int imageQuality, string format = "Webp");
}
}
diff --git a/src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.cs
similarity index 71%
rename from src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.cs
index 2513a8e20..45aaaf6d2 100644
--- a/src/Business/Grand.Business.System/Interfaces/Admin/IAdminSiteMapService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/Admin/IAdminSiteMapService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Admin;
-namespace Grand.Business.System.Interfaces.Admin
+namespace Grand.Business.Core.Interfaces.System.Admin
{
public interface IAdminSiteMapService
{
diff --git a/src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs b/src/Business/Grand.Business.Core/Interfaces/System/ExportImport/IExportManager.cs
similarity index 97%
rename from src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/ExportImport/IExportManager.cs
index 1532264c1..c2038e91f 100644
--- a/src/Business/Grand.Business.System/Interfaces/ExportImport/IExportManager.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/ExportImport/IExportManager.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Directory;
using Grand.Domain.Messages;
using Grand.Domain.Orders;
-namespace Grand.Business.System.Interfaces.ExportImport
+namespace Grand.Business.Core.Interfaces.System.ExportImport
{
/// <summary>
/// Export manager interface
diff --git a/src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs b/src/Business/Grand.Business.Core/Interfaces/System/ExportImport/IImportManager.cs
similarity index 95%
rename from src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/ExportImport/IImportManager.cs
index fa5523b72..0c452aa85 100644
--- a/src/Business/Grand.Business.System/Interfaces/ExportImport/IImportManager.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/ExportImport/IImportManager.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Interfaces.ExportImport
+namespace Grand.Business.Core.Interfaces.System.ExportImport
{
/// <summary>
/// Import manager interface
diff --git a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Installation/IInstallationLocalizedService.cs
similarity index 91%
rename from src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/Installation/IInstallationLocalizedService.cs
index 7cf794071..fbbbdd8c3 100644
--- a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationLocalizedService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/Installation/IInstallationLocalizedService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Utilities.System;
-namespace Grand.Business.System.Interfaces.Installation
+namespace Grand.Business.Core.Interfaces.System.Installation
{
/// <summary>
/// Translation service for installation process
diff --git a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Installation/IInstallationService.cs
similarity index 87%
rename from src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/Installation/IInstallationService.cs
index 4780e0d0d..9463fb7c8 100644
--- a/src/Business/Grand.Business.System/Interfaces/Installation/IInstallationService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/Installation/IInstallationService.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Http;
-namespace Grand.Business.System.Interfaces.Installation
+namespace Grand.Business.Core.Interfaces.System.Installation
{
public partial interface IInstallationService
{
diff --git a/src/Business/Grand.Business.System/Interfaces/MachineNameProvider/IMachineNameProvider.cs b/src/Business/Grand.Business.Core/Interfaces/System/MachineNameProvider/IMachineNameProvider.cs
similarity index 85%
rename from src/Business/Grand.Business.System/Interfaces/MachineNameProvider/IMachineNameProvider.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/MachineNameProvider/IMachineNameProvider.cs
index 8e78c55a8..16fccafb1 100644
--- a/src/Business/Grand.Business.System/Interfaces/MachineNameProvider/IMachineNameProvider.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/MachineNameProvider/IMachineNameProvider.cs
@@ -1,5 +1,5 @@
//Contribution: Orchard project (http://www.orchardproject.net/)
-namespace Grand.Business.System.Interfaces.MachineNameProvider
+namespace Grand.Business.Core.Interfaces.System.MachineNameProvider
{
/// <summary>
/// Describes a service which the name of the machine (instance) running the application.
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Reports/ICustomerReportService.cs
similarity index 95%
rename from src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/Reports/ICustomerReportService.cs
index 50699e0fe..380cae8c1 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/ICustomerReportService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/Reports/ICustomerReportService.cs
@@ -1,9 +1,9 @@
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-namespace Grand.Business.System.Interfaces.Reports
+namespace Grand.Business.Core.Interfaces.System.Reports
{
/// <summary>
/// Customer report service interface
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Reports/IOrderReportService.cs
similarity index 98%
rename from src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/Reports/IOrderReportService.cs
index 78a9e0ac0..cf495bfb3 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/IOrderReportService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/Reports/IOrderReportService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
-namespace Grand.Business.System.Interfaces.Reports
+namespace Grand.Business.Core.Interfaces.System.Reports
{
/// <summary>
/// Order report service interface
diff --git a/src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs b/src/Business/Grand.Business.Core/Interfaces/System/Reports/IProductsReportService.cs
similarity index 84%
rename from src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/Reports/IProductsReportService.cs
index 65aa2d5a4..c0c2b0230 100644
--- a/src/Business/Grand.Business.System/Interfaces/Reports/IProductsReportService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/Reports/IProductsReportService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain.Catalog;
-namespace Grand.Business.System.Interfaces.Reports
+namespace Grand.Business.Core.Interfaces.System.Reports
{
/// <summary>
/// Product report service interface
diff --git a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs b/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTask.cs
similarity index 53%
rename from src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTask.cs
index 3588ed9ed..6fb4d8ce6 100644
--- a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTask.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTask.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Interfaces.ScheduleTasks
+namespace Grand.Business.Core.Interfaces.System.ScheduleTasks
{
public interface IScheduleTask
{
diff --git a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs b/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs
similarity index 95%
rename from src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs
rename to src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs
index 19e8ecedb..f72720cd1 100644
--- a/src/Business/Grand.Business.System/Interfaces/ScheduleTasks/IScheduleTaskService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Tasks;
-namespace Grand.Business.System.Interfaces.ScheduleTasks
+namespace Grand.Business.Core.Interfaces.System.ScheduleTasks
{
public partial interface IScheduleTaskService
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs
similarity index 82%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs
index 5183dbb66..4e098ae80 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetPersonalizedProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetPersonalizedProductsQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Queries.Models
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetPersonalizedProductsQuery : IRequest<IList<Product>>
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetPriceByCustomerProductQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs
similarity index 80%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetPriceByCustomerProductQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs
index d649b23be..34e3413e0 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetPriceByCustomerProductQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetPriceByCustomerProductQuery.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Grand.Business.Catalog.Queries.Models
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetPriceByCustomerProductQuery : IRequest<double?>
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetProductArchByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs
similarity index 77%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetProductArchByIdQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs
index 8585e0481..dc984dab5 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetProductArchByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetProductArchByIdQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Queries.Models
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetProductArchByIdQuery : IRequest<Product>
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs
similarity index 82%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs
index 73b67cfee..9a4510417 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetRecommendedProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetRecommendedProductsQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Queries.Models
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetRecommendedProductsQuery : IRequest<IList<Product>>
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs
similarity index 97%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs
index d5490a9e8..72629da0a 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetSearchProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetSearchProductsQuery.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Catalog.Queries.Handlers
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetSearchProductsQuery : IRequest<(IPagedList<Product> products, IList<string> filterableSpecificationAttributeOptionIds)>
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs
similarity index 82%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs
index 88dfa006b..189ef1d7b 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetSuggestedProductsQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetSuggestedProductsQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Catalog.Queries.Models
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetSuggestedProductsQuery : IRequest<IList<Product>>
{
diff --git a/src/Business/Grand.Business.Catalog/Queries/Models/GetVendorByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Catalog/Queries/Models/GetVendorByIdQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs
index 299fd595e..61a789205 100644
--- a/src/Business/Grand.Business.Catalog/Queries/Models/GetVendorByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Catalog/GetVendorByIdQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Catalog.Queries.Models
+namespace Grand.Business.Core.Queries.Catalog
{
public class GetVendorByIdQuery : IRequest<Vendor>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs
similarity index 73%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs
index 7edb64d06..c0f06e9ee 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCancelOrderQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCancelOrderQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanCancelOrderQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCaptureQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCaptureQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs
index 175594456..35c38b24c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanCaptureQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanCaptureQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanCaptureQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
similarity index 78%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
index dcde5de39..29b18cb78 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsAuthorizedQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanMarkPaymentTransactionAsAuthorizedQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanMarkPaymentTransactionAsPaidQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
similarity index 78%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
index 847675d93..ba0f84dcd 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanMarkPaymentTransactionAsPaidQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanMarkPaymentTransactionAsPaidQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyPaidOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs
similarity index 81%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyPaidOfflineQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs
index 7d1add5eb..48ba463c0 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyPaidOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyPaidOfflineQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanPartiallyPaidOfflineQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyRefundOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs
similarity index 81%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyRefundOfflineQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs
index a69f301a1..3509e078b 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyRefundOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundOfflineQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanPartiallyRefundOfflineQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyRefundQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs
similarity index 81%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyRefundQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs
index 1696b2ca5..0579c8d53 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanPartiallyRefundQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanPartiallyRefundQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanPartiallyRefundQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanRefundOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanRefundOfflineQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs
index 7eeec5521..61f65c0a8 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanRefundOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundOfflineQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanRefundOfflineQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanRefundQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanRefundQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs
index 9a5d82039..802a0bdd0 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanRefundQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanRefundQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanRefundQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanVoidOfflineQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanVoidOfflineQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs
index febf8dc54..539de1501 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanVoidOfflineQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidOfflineQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanVoidOfflineQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanVoidQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanVoidQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs
index 150bb1389..b368bed57 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/CanVoidQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/CanVoidQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class CanVoidQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs
similarity index 92%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs
index 0318b884e..da288b536 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetGiftVoucherQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetGiftVoucherQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetGiftVoucherQuery : IRequest<IQueryable<GiftVoucher>>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnCountQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs
similarity index 77%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnCountQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs
index 792d975b3..c641f9cc7 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnCountQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnCountQuery.cs
@@ -1,5 +1,5 @@
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetMerchandiseReturnCountQuery : IRequest<int>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs
similarity index 92%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs
index b59a39d89..071ba7bc5 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetMerchandiseReturnQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetMerchandiseReturnQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetMerchandiseReturnQuery : IRequest<IQueryable<MerchandiseReturn>>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
index fe1040d30..3cc6f2899 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetOrderQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetOrderQuery.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetOrderQuery : IRequest<IQueryable<Order>>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs
similarity index 91%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs
index dfc8fc630..d0050a17c 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPaymentTransactionQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPaymentTransactionQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Payments;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetPaymentTransactionQuery : IRequest<IQueryable<PaymentTransaction>>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPickupPointById.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs
similarity index 74%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPickupPointById.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs
index c295d7afd..0359b003a 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetPickupPointById.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetPickupPointById.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Shipping;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetPickupPointById : IRequest<PickupPoint>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs
similarity index 77%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs
index 1e264a53b..e1911b224 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/GetVendorsInOrderQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/GetVendorsInOrderQuery.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class GetVendorsInOrderQuery : IRequest<IList<Vendor>>
{
diff --git a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/IsMerchandiseReturnAllowedQuery.cs b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs
similarity index 75%
rename from src/Business/Grand.Business.Checkout/Queries/Models/Orders/IsMerchandiseReturnAllowedQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs
index 496516222..96aabcad2 100644
--- a/src/Business/Grand.Business.Checkout/Queries/Models/Orders/IsMerchandiseReturnAllowedQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Checkout/Orders/IsMerchandiseReturnAllowedQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using MediatR;
-namespace Grand.Business.Checkout.Queries.Models.Orders
+namespace Grand.Business.Core.Queries.Checkout.Orders
{
public class IsMerchandiseReturnAllowedQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs b/src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs
similarity index 96%
rename from src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs
index e92fc31ef..f0379580c 100644
--- a/src/Business/Grand.Business.Customers/Queries/Models/GetCustomerQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Customers/GetCustomerQuery.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Orders;
using MediatR;
using System.Linq.Expressions;
-namespace Grand.Business.Customers.Queries.Models
+namespace Grand.Business.Core.Queries.Customers
{
public class GetCustomerQuery : IRequest<IQueryable<Customer>>
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Models/GetGroupBySystemNameQuery.cs b/src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs
similarity index 78%
rename from src/Business/Grand.Business.Customers/Queries/Models/GetGroupBySystemNameQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs
index a54c459ce..c0610996b 100644
--- a/src/Business/Grand.Business.Customers/Queries/Models/GetGroupBySystemNameQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Customers/GetGroupBySystemNameQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Customers.Queries.Models
+namespace Grand.Business.Core.Queries.Customers
{
public class GetGroupBySystemNameQuery : IRequest<CustomerGroup>
{
diff --git a/src/Business/Grand.Business.Customers/Queries/Models/GetPasswordIsExpiredQuery.cs b/src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs
similarity index 77%
rename from src/Business/Grand.Business.Customers/Queries/Models/GetPasswordIsExpiredQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs
index 86e73594f..13a5fbc12 100644
--- a/src/Business/Grand.Business.Customers/Queries/Models/GetPasswordIsExpiredQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Customers/GetPasswordIsExpiredQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Customers.Queries.Models
+namespace Grand.Business.Core.Queries.Customers
{
public class GetPasswordIsExpiredQuery : IRequest<bool>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs
similarity index 77%
rename from src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs
index f1e055f66..b5a4a7ca0 100644
--- a/src/Business/Grand.Business.Messages/Queries/Models/GetBidsByProductIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetBidsByProductIdQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models
+namespace Grand.Business.Core.Queries.Messages
{
public class GetBidsByProductIdQuery : IRequest<IList<Bid>>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Models/GetCustomerByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Messages/Queries/Models/GetCustomerByIdQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs
index 214439c69..dfc20a98d 100644
--- a/src/Business/Grand.Business.Messages/Queries/Models/GetCustomerByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetCustomerByIdQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models
+namespace Grand.Business.Core.Queries.Messages
{
public class GetCustomerByIdQuery : IRequest<Customer>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Models/GetProductByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Messages/Queries/Models/GetProductByIdQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs
index 76bf09a13..11e3493bb 100644
--- a/src/Business/Grand.Business.Messages/Queries/Models/GetProductByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetProductByIdQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Catalog;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models
+namespace Grand.Business.Core.Queries.Messages
{
public class GetProductByIdQuery : IRequest<Product>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Models/GetVendorByIdQuery.cs b/src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs
similarity index 76%
rename from src/Business/Grand.Business.Messages/Queries/Models/GetVendorByIdQuery.cs
rename to src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs
index 27f13d3c7..bef8e706d 100644
--- a/src/Business/Grand.Business.Messages/Queries/Models/GetVendorByIdQuery.cs
+++ b/src/Business/Grand.Business.Core/Queries/Messages/GetVendorByIdQuery.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models
+namespace Grand.Business.Core.Queries.Messages
{
public class GetVendorByIdQuery : IRequest<Vendor>
{
diff --git a/src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs b/src/Business/Grand.Business.Core/Utilities/Authentication/ExternalAuthParam.cs
similarity index 95%
rename from src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs
rename to src/Business/Grand.Business.Core/Utilities/Authentication/ExternalAuthParam.cs
index 0c1d7f1fd..05dc2124d 100644
--- a/src/Business/Grand.Business.Authentication/Utilities/ExternalAuthParam.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Authentication/ExternalAuthParam.cs
@@ -1,6 +1,6 @@
using System.Security.Claims;
-namespace Grand.Business.Authentication.Utilities
+namespace Grand.Business.Core.Utilities.Authentication
{
/// <summary>
/// External auth param
diff --git a/src/Business/Grand.Business.Authentication/Utilities/GrandCookieAuthenticationDefaults.cs b/src/Business/Grand.Business.Core/Utilities/Authentication/GrandCookieAuthenticationDefaults.cs
similarity index 95%
rename from src/Business/Grand.Business.Authentication/Utilities/GrandCookieAuthenticationDefaults.cs
rename to src/Business/Grand.Business.Core/Utilities/Authentication/GrandCookieAuthenticationDefaults.cs
index b6cb0c2fb..294cb5e07 100644
--- a/src/Business/Grand.Business.Authentication/Utilities/GrandCookieAuthenticationDefaults.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Authentication/GrandCookieAuthenticationDefaults.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Http;
-namespace Grand.Business.Authentication.Utilities
+namespace Grand.Business.Core.Utilities.Authentication
{
public static class GrandCookieAuthenticationDefaults
{
diff --git a/src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs b/src/Business/Grand.Business.Core/Utilities/Authentication/TwoFactorCodeSetup.cs
similarity index 80%
rename from src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs
rename to src/Business/Grand.Business.Core/Utilities/Authentication/TwoFactorCodeSetup.cs
index 1d3a4f411..840a4e2d4 100644
--- a/src/Business/Grand.Business.Authentication/Utilities/TwoFactorCodeSetup.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Authentication/TwoFactorCodeSetup.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Authentication.Utilities
+namespace Grand.Business.Core.Utilities.Authentication
{
public partial class TwoFactorCodeSetup
{
diff --git a/src/Business/Grand.Business.Catalog/Utilities/ApplyDiscount.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/ApplyDiscount.cs
similarity index 91%
rename from src/Business/Grand.Business.Catalog/Utilities/ApplyDiscount.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/ApplyDiscount.cs
index 68cae379c..01caf1c7a 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/ApplyDiscount.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/ApplyDiscount.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Applied discount
diff --git a/src/Business/Grand.Business.Catalog/Utilities/DiscountRuleValidationRequest.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.cs
similarity index 94%
rename from src/Business/Grand.Business.Catalog/Utilities/DiscountRuleValidationRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.cs
index 26c7b4486..c1b44ba95 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/DiscountRuleValidationRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationRequest.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Customers;
using Grand.Domain.Stores;
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Represents a discount requirement validation request
diff --git a/src/Business/Grand.Business.Catalog/Utilities/DiscountRuleValidationResult.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationResult.cs
similarity index 91%
rename from src/Business/Grand.Business.Catalog/Utilities/DiscountRuleValidationResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationResult.cs
index 628fe0622..9204f2bda 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/DiscountRuleValidationResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountRuleValidationResult.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Represents a result of discount requirement validation
diff --git a/src/Business/Grand.Business.Catalog/Utilities/DiscountValidationResult.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountValidationResult.cs
similarity index 93%
rename from src/Business/Grand.Business.Catalog/Utilities/DiscountValidationResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/DiscountValidationResult.cs
index 684372915..e9792b33d 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/DiscountValidationResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/DiscountValidationResult.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Represents a result of discount validation
diff --git a/src/Business/Grand.Business.Catalog/Utilities/ProductsCategory.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/ProductsCategory.cs
similarity index 75%
rename from src/Business/Grand.Business.Catalog/Utilities/ProductsCategory.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/ProductsCategory.cs
index b32ddbd34..77b4b0716 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/ProductsCategory.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/ProductsCategory.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
public class ProductsCategory : ProductCategory
{
diff --git a/src/Business/Grand.Business.Catalog/Utilities/ProductsCollection.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/ProductsCollection.cs
similarity index 75%
rename from src/Business/Grand.Business.Catalog/Utilities/ProductsCollection.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/ProductsCollection.cs
index 90da14190..d3bd67b25 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/ProductsCollection.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/ProductsCollection.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
public class ProductsCollection : ProductCollection
{
diff --git a/src/Business/Grand.Business.Catalog/Utilities/SearchTermReportLine.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/SearchTermReportLine.cs
similarity index 88%
rename from src/Business/Grand.Business.Catalog/Utilities/SearchTermReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/SearchTermReportLine.cs
index 0bad4a405..c7cab02fa 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/SearchTermReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/SearchTermReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Search term (for statistics)
diff --git a/src/Business/Grand.Business.Catalog/Services/Tax/TaxProductPrice.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/TaxProductPrice.cs
similarity index 92%
rename from src/Business/Grand.Business.Catalog/Services/Tax/TaxProductPrice.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/TaxProductPrice.cs
index 47f7a7f5a..aae46d5c5 100644
--- a/src/Business/Grand.Business.Catalog/Services/Tax/TaxProductPrice.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/TaxProductPrice.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Services.Tax
+namespace Grand.Business.Core.Utilities.Catalog
{
public class TaxProductPrice
{
diff --git a/src/Business/Grand.Business.Catalog/Utilities/TaxRequest.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/TaxRequest.cs
similarity index 94%
rename from src/Business/Grand.Business.Catalog/Utilities/TaxRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/TaxRequest.cs
index 7bc4eaf8f..00275eccc 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/TaxRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/TaxRequest.cs
@@ -2,7 +2,7 @@ using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Represents a request for tax calculation
diff --git a/src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/TaxResult.cs
similarity index 95%
rename from src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/TaxResult.cs
index 4ea562fd0..7bad425f5 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/TaxResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/TaxResult.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
/// <summary>
/// Represents a result of tax calculation
diff --git a/src/Business/Grand.Business.Catalog/Utilities/VatRequest.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/VatRequest.cs
similarity index 73%
rename from src/Business/Grand.Business.Catalog/Utilities/VatRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/VatRequest.cs
index 514cca282..071972d56 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/VatRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/VatRequest.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
public class VatRequest
{
diff --git a/src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs b/src/Business/Grand.Business.Core/Utilities/Catalog/VatResponse.cs
similarity index 86%
rename from src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs
rename to src/Business/Grand.Business.Core/Utilities/Catalog/VatResponse.cs
index edc4ce6bc..e77ab8f57 100644
--- a/src/Business/Grand.Business.Catalog/Utilities/VatResponse.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Catalog/VatResponse.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Catalog.Utilities
+namespace Grand.Business.Core.Utilities.Catalog
{
public class VatResponse
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/AppliedGiftVoucher.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/AppliedGiftVoucher.cs
similarity index 89%
rename from src/Business/Grand.Business.Checkout/Utilities/AppliedGiftVoucher.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/AppliedGiftVoucher.cs
index 4ee2a6b6c..e151eea55 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/AppliedGiftVoucher.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/AppliedGiftVoucher.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Applied gift voucher
diff --git a/src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/CapturePaymentResult.cs
similarity index 97%
rename from src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/CapturePaymentResult.cs
index 1ca0162f9..6bc3ebf21 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/CapturePaymentResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/CapturePaymentResult.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Capture payment result
diff --git a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/GetShippingOptionRequest.cs
similarity index 98%
rename from src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/GetShippingOptionRequest.cs
index 5827f3743..b8c03c4a0 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/GetShippingOptionRequest.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Represents a request for getting shipping rate options
diff --git a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/GetShippingOptionResponse.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/GetShippingOptionResponse.cs
index 27943d9e6..0754fbcf5 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/GetShippingOptionResponse.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/GetShippingOptionResponse.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Shipping;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Represents a response of getting shipping rate options
diff --git a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/PlaceOrderContainter.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/PlaceOrderContainter.cs
index 950446ced..5bf9e1e0c 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderContainter.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/PlaceOrderContainter.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -8,7 +8,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Tax;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
public class PlaceOrderContainter
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/PlaceOrderResult.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/PlaceOrderResult.cs
index 7383c3230..d6d5fbc37 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/PlaceOrderResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/PlaceOrderResult.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Orders;
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Place order result
diff --git a/src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/ProcessPaymentResult.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/ProcessPaymentResult.cs
index 4030aa242..b3c49884a 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/ProcessPaymentResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/ProcessPaymentResult.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Process payment result
diff --git a/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentRequest.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/RefundPaymentRequest.cs
similarity index 93%
rename from src/Business/Grand.Business.Checkout/Utilities/RefundPaymentRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/RefundPaymentRequest.cs
index 42826e6d2..8efb1effe 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/RefundPaymentRequest.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Represents a RefundPaymentResult
diff --git a/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/RefundPaymentResult.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/RefundPaymentResult.cs
index 0a4eb14da..7f8d6fd7a 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/RefundPaymentResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/RefundPaymentResult.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Refund payment result
diff --git a/src/Business/Grand.Business.Checkout/Utilities/ShoppingCartValidatorOptions.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/ShoppingCartValidatorOptions.cs
similarity index 88%
rename from src/Business/Grand.Business.Checkout/Utilities/ShoppingCartValidatorOptions.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/ShoppingCartValidatorOptions.cs
index bea087974..958c083a5 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/ShoppingCartValidatorOptions.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/ShoppingCartValidatorOptions.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Checkout.Services.Orders
+namespace Grand.Business.Core.Utilities.Checkout
{
public class ShoppingCartValidatorOptions
{
diff --git a/src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs b/src/Business/Grand.Business.Core/Utilities/Checkout/VoidPaymentResult.cs
similarity index 96%
rename from src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Checkout/VoidPaymentResult.cs
index 931601061..63b85b634 100644
--- a/src/Business/Grand.Business.Checkout/Utilities/VoidPaymentResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Checkout/VoidPaymentResult.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Payments;
-namespace Grand.Business.Checkout.Utilities
+namespace Grand.Business.Core.Utilities.Checkout
{
/// <summary>
/// Represents a VoidPaymentResult
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionActionName.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionActionName.cs
similarity index 95%
rename from src/Business/Grand.Business.Common/Services/Security/PermissionActionName.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionActionName.cs
index 49ef067e5..f5e633e28 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionActionName.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionActionName.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static class PermissionActionName
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionSystemName.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionSystemName.cs
index 151cc4e91..ec561c717 100644
--- a/src/Business/Grand.Business.Common/Services/Security/PermissionSystemName.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/PermissionSystemName.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static class PermissionSystemName
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermission.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermission.cs
similarity index 89%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermission.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermission.cs
index e1a674eda..eb2e07ccd 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermission.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermission.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
/// <summary>
/// Standard permissions
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionCatalog.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionCatalog.cs
index d26086f97..6c97da08d 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCatalog.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionCatalog.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs
similarity index 99%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs
index 9b19a9c6d..afb9f26da 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionConfiguration.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionConfiguration.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionContent.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionContent.cs
index 832dde658..b0c9c68a8 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionContent.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionContent.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionCustomer.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionCustomer.cs
index 533e30885..ffeb73743 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionCustomer.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionCustomer.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionMarketing.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionMarketing.cs
index e3508de32..6b766b2f0 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionMarketing.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionMarketing.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionOrder.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionOrder.cs
index 335720971..b0c9c0cd3 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionOrder.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionOrder.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionPublicStore.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionPublicStore.cs
similarity index 97%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionPublicStore.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionPublicStore.cs
index 278949017..276869a3b 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionPublicStore.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionPublicStore.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionReport.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionReport.cs
similarity index 88%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionReport.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionReport.cs
index e2a497029..3977fc034 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionReport.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionReport.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionSystem.cs
similarity index 98%
rename from src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
rename to src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionSystem.cs
index bd80a106c..80b6d3221 100644
--- a/src/Business/Grand.Business.Common/Services/Security/StandardPermissionSystem.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Common/Security/StandardPermissionSystem.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Permissions;
-namespace Grand.Business.Common.Services.Security
+namespace Grand.Business.Core.Utilities.Common.Security
{
public static partial class StandardPermission
{
diff --git a/src/Business/Grand.Business.Customers/Utilities/ChangePasswordRequest.cs b/src/Business/Grand.Business.Core/Utilities/Customers/ChangePasswordRequest.cs
similarity index 96%
rename from src/Business/Grand.Business.Customers/Utilities/ChangePasswordRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Customers/ChangePasswordRequest.cs
index 8edf43247..2a1ed05fc 100644
--- a/src/Business/Grand.Business.Customers/Utilities/ChangePasswordRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Customers/ChangePasswordRequest.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Utilities
+namespace Grand.Business.Core.Utilities.Customers
{
/// <summary>
/// Change password requst
diff --git a/src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs b/src/Business/Grand.Business.Core/Utilities/Customers/ChangePasswordResult.cs
similarity index 94%
rename from src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Customers/ChangePasswordResult.cs
index 31ff7ac69..7044fe2c4 100644
--- a/src/Business/Grand.Business.Customers/Utilities/ChangePasswordResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Customers/ChangePasswordResult.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Customers.Utilities
+namespace Grand.Business.Core.Utilities.Customers
{
/// <summary>
/// Change password result
diff --git a/src/Business/Grand.Business.Customers/Utilities/RegistrationRequest.cs b/src/Business/Grand.Business.Core/Utilities/Customers/RegistrationRequest.cs
similarity index 97%
rename from src/Business/Grand.Business.Customers/Utilities/RegistrationRequest.cs
rename to src/Business/Grand.Business.Core/Utilities/Customers/RegistrationRequest.cs
index d28ddeb91..07029e023 100644
--- a/src/Business/Grand.Business.Customers/Utilities/RegistrationRequest.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Customers/RegistrationRequest.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Customers;
-namespace Grand.Business.Customers.Utilities
+namespace Grand.Business.Core.Utilities.Customers
{
/// <summary>
/// Customer registration request
diff --git a/src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs b/src/Business/Grand.Business.Core/Utilities/Customers/RegistrationResult.cs
similarity index 94%
rename from src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Customers/RegistrationResult.cs
index 0fa2045ae..2687767fa 100644
--- a/src/Business/Grand.Business.Customers/Utilities/RegistrationResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Customers/RegistrationResult.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.Customers.Utilities
+namespace Grand.Business.Core.Utilities.Customers
{
/// <summary>
/// Customerregistration result
diff --git a/src/Business/Grand.Business.Core/Utilities/Marketing/SerializeCustomerReminderHistory.cs b/src/Business/Grand.Business.Core/Utilities/Marketing/SerializeCustomerReminderHistory.cs
new file mode 100644
index 000000000..f47910c1a
--- /dev/null
+++ b/src/Business/Grand.Business.Core/Utilities/Marketing/SerializeCustomerReminderHistory.cs
@@ -0,0 +1,12 @@
+namespace Grand.Business.Core.Utilities.Marketing
+{
+ public class SerializeCustomerReminderHistory
+ {
+ public string Id { get; set; }
+ public string CustomerReminderId { get; set; }
+ public string CustomerId { get; set; }
+ public DateTime SendDate { get; set; }
+ public int Level { get; set; }
+ public string OrderId { get; set; }
+ }
+}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAskQuestion.cs
similarity index 93%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAskQuestion.cs
index edc5d821c..e4d5146df 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAskQuestion.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAskQuestion.cs
@@ -1,6 +1,6 @@
using DotLiquid;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidAskQuestion : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAttributeCombination.cs
similarity index 91%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAttributeCombination.cs
index 3d7f7ff9c..fbad24fb0 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAttributeCombination.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAttributeCombination.cs
@@ -1,7 +1,7 @@
using DotLiquid;
using Grand.Domain.Catalog;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidAttributeCombination : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAuctions.cs
similarity index 92%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAuctions.cs
index b73060396..9b4af3633 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidAuctions.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidAuctions.cs
@@ -1,7 +1,7 @@
using DotLiquid;
using Grand.Domain.Catalog;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidAuctions : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidBlogComment.cs
similarity index 72%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidBlogComment.cs
index c2b6f37e8..95f51421e 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidBlogComment.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidBlogComment.cs
@@ -1,10 +1,9 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Blogs;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidBlogComment : Drop
{
@@ -13,7 +12,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
private readonly Store _store;
private readonly DomainHost _host;
private readonly Language _language;
-
+
private string url;
public LiquidBlogComment(BlogComment blogComment, BlogPost blogPost, Store store, DomainHost host, Language language)
@@ -29,24 +28,19 @@ namespace Grand.Business.Messages.DotLiquidDrops
AdditionalTokens = new Dictionary<string, string>();
}
- public string BlogPostTitle
- {
+ public string BlogPostTitle {
get { return _blogPost.Title; }
}
- public string BlogPostURL
- {
- get
- {
- return $"{url}/{_blogPost.GetSeName(_language.Id)}";
+ public string BlogPostURL {
+ get {
+ return $"{url}/{_blogPost.SeName}";
}
}
- public string BlogPostCommentText
- {
- get
- {
- return _blogComment?.CommentText;
+ public string BlogPostCommentText {
+ get {
+ return _blogComment?.CommentText;
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidContactUs.cs
similarity index 94%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidContactUs.cs
index 1dab274cb..f583f1f63 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidContactUs.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidContactUs.cs
@@ -1,6 +1,6 @@
using DotLiquid;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidContactUs : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidCustomer.cs
similarity index 98%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidCustomer.cs
index 9257f0013..2ca97b3a9 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidCustomer.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidCustomer.cs
@@ -6,7 +6,7 @@ using Grand.Domain.Tax;
using Grand.SharedKernel.Extensions;
using System.Net;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidCustomer : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidEmail.cs
similarity index 82%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidEmail.cs
index 771545d49..4fd7efabe 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmail.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidEmail.cs
@@ -1,6 +1,6 @@
using DotLiquid;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidEmail : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidEmailAFriend.cs
similarity index 93%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidEmailAFriend.cs
index 5132b1f41..d9b31c27f 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidEmailAFriend.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidEmailAFriend.cs
@@ -1,6 +1,6 @@
using DotLiquid;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidEmailAFriend : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidExtensions.cs
similarity index 93%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidExtensions.cs
index f7b010c02..d1f62de65 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidExtensions.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidExtensions.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Messages;
using System.Reflection;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public static class LiquidExtensions
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidGiftVoucher.cs
similarity index 95%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidGiftVoucher.cs
index cf7198ef5..bb91f0a5b 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidGiftVoucher.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidGiftVoucher.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Orders;
using Grand.SharedKernel.Extensions;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidGiftVoucher : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidKnowledgebase.cs
similarity index 81%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidKnowledgebase.cs
index 74f6b0ed7..2659eb3e7 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidKnowledgebase.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidKnowledgebase.cs
@@ -1,10 +1,9 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Knowledgebase;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidKnowledgebase : Drop
{
@@ -29,19 +28,16 @@ namespace Grand.Business.Messages.DotLiquidDrops
AdditionalTokens = new Dictionary<string, string>();
}
- public string ArticleTitle
- {
+ public string ArticleTitle {
get { return _article.Name; }
}
public string ArticleCommentText {
get { return _articleComment.CommentText; }
}
- public string ArticleCommentUrl
- {
- get
- {
- return $"{url}/{_article.GetSeName(_language.Id)}";
+ public string ArticleCommentUrl {
+ get {
+ return $"{url}/{_article.SeName}";
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
similarity index 98%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
index 57e86cb46..fe136ec33 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidMerchandiseReturn.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Stores;
using Grand.SharedKernel.Extensions;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidMerchandiseReturn : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
similarity index 54%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
index c49e0c2f3..bb9d49034 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidMerchandiseReturnItem.cs
@@ -1,10 +1,9 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using System.Net;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidMerchandiseReturnItem : Drop
{
@@ -23,164 +22,128 @@ namespace Grand.Business.Messages.DotLiquidDrops
}
- public string ProductName
- {
- get
- {
+ public string ProductName {
+ get {
string name = "";
if (_product != null)
- name = WebUtility.HtmlEncode(_product.GetTranslation(x => x.Name, _languageId));
+ name = WebUtility.HtmlEncode(_product.Name);
return name;
}
}
- public string ProductSeName
- {
- get
- {
+ public string ProductSeName {
+ get {
string name = "";
if (_product != null)
- name = _product.GetTranslation(x => x.SeName, _languageId);
+ name = _product.SeName;
return name;
}
}
- public string ProductShortDescription
- {
- get
- {
+ public string ProductShortDescription {
+ get {
string desc = "";
if (_product != null)
- desc = WebUtility.HtmlEncode(_product.GetTranslation(x => x.ShortDescription, _languageId));
+ desc = WebUtility.HtmlEncode(_product.ShortDescription);
return desc;
}
}
- public string ProductFullDescription
- {
- get
- {
+ public string ProductFullDescription {
+ get {
string desc = "";
if (_product != null)
- desc = WebUtility.HtmlDecode(_product.GetTranslation(x => x.FullDescription, _languageId));
+ desc = WebUtility.HtmlDecode(_product.FullDescription);
return desc;
}
}
- public string ProductId
- {
- get
- {
+ public string ProductId {
+ get {
return _product.Id;
}
}
- public int Quantity
- {
- get
- {
+ public int Quantity {
+ get {
return _item.Quantity;
}
}
- public string ReasonForReturn
- {
- get
- {
+ public string ReasonForReturn {
+ get {
return _item.ReasonForReturn;
}
}
- public string RequestedAction
- {
- get
- {
+ public string RequestedAction {
+ get {
return _item.RequestedAction;
}
}
- public double UnitPriceWithoutDiscInclTax
- {
- get
- {
+ public double UnitPriceWithoutDiscInclTax {
+ get {
return _orderItem.UnitPriceWithoutDiscInclTax;
}
}
- public double UnitPriceWithoutDiscExclTax
- {
- get
- {
+ public double UnitPriceWithoutDiscExclTax {
+ get {
return _orderItem.UnitPriceWithoutDiscExclTax;
}
}
- public double UnitPriceInclTax
- {
- get
- {
+ public double UnitPriceInclTax {
+ get {
return _orderItem.UnitPriceInclTax;
}
}
- public double UnitPriceExclTax
- {
- get
- {
+ public double UnitPriceExclTax {
+ get {
return _orderItem.UnitPriceExclTax;
}
}
- public double PriceInclTax
- {
- get
- {
+ public double PriceInclTax {
+ get {
return _orderItem.PriceInclTax;
}
}
- public double PriceExclTax
- {
- get
- {
+ public double PriceExclTax {
+ get {
return _orderItem.PriceExclTax;
}
}
- public double DiscountAmountInclTax
- {
- get
- {
+ public double DiscountAmountInclTax {
+ get {
return _orderItem.DiscountAmountInclTax;
}
}
- public double DiscountAmountExclTax
- {
- get
- {
+ public double DiscountAmountExclTax {
+ get {
return _orderItem.DiscountAmountExclTax;
}
}
- public double OriginalProductCost
- {
- get
- {
+ public double OriginalProductCost {
+ get {
return _orderItem.OriginalProductCost;
}
}
- public string AttributeDescription
- {
- get
- {
+ public string AttributeDescription {
+ get {
return _orderItem.AttributeDescription;
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidNewsComment.cs
similarity index 77%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidNewsComment.cs
index f3f6c9463..0608d5440 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsComment.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidNewsComment.cs
@@ -1,10 +1,9 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Localization;
using Grand.Domain.News;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidNewsComment : Drop
{
@@ -29,24 +28,20 @@ namespace Grand.Business.Messages.DotLiquidDrops
AdditionalTokens = new Dictionary<string, string>();
}
- public string NewsTitle
- {
+ public string NewsTitle {
get { return _newsItem.Title; }
}
- public string CommentText
- {
+ public string CommentText {
get { return _newsComment.CommentText; }
}
- public string CommentTitle
- {
+ public string CommentTitle {
get { return _newsComment.CommentTitle; }
}
- public string NewsURL
- {
- get { return $"{url}/{_newsItem.GetSeName(_language.Id)}"; }
+ public string NewsURL {
+ get { return $"{url}/{_newsItem.SeName}"; }
}
public IDictionary<string, string> AdditionalTokens { get; set; }
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
similarity index 96%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
index 84b3f5d89..5cae9e9c9 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidNewsLetterSubscription.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Messages;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidNewsLetterSubscription : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs
similarity index 98%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs
index 6ccabd922..bae78b5e3 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidObjectBuilder.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidObjectBuilder.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.Extensions;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
@@ -13,7 +13,7 @@ using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public class LiquidObjectBuilder
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOrder.cs
similarity index 99%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOrder.cs
index 2fba85aed..e6e154b16 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrder.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOrder.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using Grand.SharedKernel.Extensions;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidOrder : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOrderItem.cs
similarity index 98%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOrderItem.cs
index 21971a0e4..9753968b4 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOrderItem.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOrderItem.cs
@@ -1,5 +1,5 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
@@ -7,7 +7,7 @@ using Grand.Domain.Stores;
using Grand.Domain.Vendors;
using System.Net;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidOrderItem : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
similarity index 83%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
index 4cbb7c643..4d5c5435a 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidOutOfStockSubscription.cs
@@ -1,10 +1,9 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidOutOfStockSubscription : Drop
{
@@ -28,19 +27,16 @@ namespace Grand.Business.Messages.DotLiquidDrops
AdditionalTokens = new Dictionary<string, string>();
}
- public string ProductName
- {
+ public string ProductName {
get { return _product.Name; }
}
- public string AttributeInfo
- {
+ public string AttributeInfo {
get { return _outOfStockSubscription.AttributeInfo; }
}
- public string ProductUrl
- {
- get { return string.Format("{0}/{1}", url, _product.GetSeName(_language.Id)); }
+ public string ProductUrl {
+ get { return string.Format("{0}/{1}", url, _product.SeName); }
}
public IDictionary<string, string> AdditionalTokens { get; set; }
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidProduct.cs
similarity index 96%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidProduct.cs
index f81988693..6efe10599 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProduct.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidProduct.cs
@@ -1,10 +1,10 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidProduct : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidProductReview.cs
similarity index 92%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidProductReview.cs
index 1ccee9d08..b5151d42a 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidProductReview.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidProductReview.cs
@@ -1,7 +1,7 @@
using DotLiquid;
using Grand.Domain.Catalog;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidProductReview : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShipment.cs
similarity index 97%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShipment.cs
index 374244db8..11d72424c 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipment.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShipment.cs
@@ -4,7 +4,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidShipment : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShipmentItem.cs
similarity index 71%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShipmentItem.cs
index 78bb45402..e52acffdd 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShipmentItem.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShipmentItem.cs
@@ -1,12 +1,11 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using System.Net;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidShipmentItem : Drop
{
@@ -31,29 +30,24 @@ namespace Grand.Business.Messages.DotLiquidDrops
public bool ShowSkuOnProductDetailsPage { get; set; }
- public string ProductName
- {
- get
- {
+ public string ProductName {
+ get {
string name = "";
if (_product != null)
- name = WebUtility.HtmlEncode(_product.GetTranslation(x => x.Name, _language.Id));
+ name = WebUtility.HtmlEncode(_product.Name);
return name;
}
}
public string ProductSku {
- get
- {
+ get {
return _orderItem.Sku;
}
}
- public string AttributeDescription
- {
- get
- {
+ public string AttributeDescription {
+ get {
string attDesc = "";
if (_orderItem != null)
@@ -63,42 +57,32 @@ namespace Grand.Business.Messages.DotLiquidDrops
}
}
- public string ShipmentId
- {
- get
- {
+ public string ShipmentId {
+ get {
return _shipment.Id;
}
}
- public string OrderItemId
- {
- get
- {
+ public string OrderItemId {
+ get {
return _shipmentItem.OrderItemId;
}
}
- public string ProductId
- {
- get
- {
+ public string ProductId {
+ get {
return _shipmentItem.ProductId;
}
}
- public int Quantity
- {
- get
- {
+ public int Quantity {
+ get {
return _shipmentItem.Quantity;
}
}
- public string WarehouseId
- {
- get
- {
+ public string WarehouseId {
+ get {
return _shipmentItem.WarehouseId;
}
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShoppingCart.cs
similarity index 95%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShoppingCart.cs
index 9e16499f8..e4b6373df 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCart.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShoppingCart.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Common;
using Grand.Domain.Customers;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidShoppingCart : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
similarity index 96%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
index 04ad4a802..5c25ccb04 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidShoppingCartItem.cs
@@ -1,11 +1,11 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using System.Net;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidShoppingCartItem : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidStore.cs
similarity index 74%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidStore.cs
index fa22d270a..0623afbaf 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidStore.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidStore.cs
@@ -1,10 +1,9 @@
using DotLiquid;
-using Grand.Business.Common.Extensions;
using Grand.Domain.Localization;
using Grand.Domain.Messages;
using Grand.Domain.Stores;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidStore : Drop
{
@@ -21,48 +20,39 @@ namespace Grand.Business.Messages.DotLiquidDrops
AdditionalTokens = new Dictionary<string, string>();
}
- public string Name
- {
- get { return _store.GetTranslation(x => x.Name, _language.Id); }
+ public string Name {
+ get { return _store.Name; }
}
- public string Shortcut
- {
- get { return _store.GetTranslation(x => x.Shortcut, _language.Id); }
+ public string Shortcut {
+ get { return _store.Shortcut; }
}
- public string URL
- {
+ public string URL {
get { return _store.SslEnabled ? _store.SecureUrl : _store.Url; }
}
- public string Email
- {
+ public string Email {
get { return _emailAccount.Email; }
}
- public string CompanyName
- {
+ public string CompanyName {
get { return _store.CompanyName; }
}
- public string CompanyAddress
- {
+ public string CompanyAddress {
get { return _store.CompanyAddress; }
}
- public string CompanyPhoneNumber
- {
+ public string CompanyPhoneNumber {
get { return _store.CompanyPhoneNumber; }
}
- public string CompanyEmail
- {
+ public string CompanyEmail {
get { return _store.CompanyEmail; }
}
- public string CompanyHours
- {
+ public string CompanyHours {
get { return _store.CompanyHours; }
}
@@ -70,8 +60,7 @@ namespace Grand.Business.Messages.DotLiquidDrops
get { return _store.CompanyRegNo; }
}
- public string CompanyVat
- {
+ public string CompanyVat {
get { return _store.CompanyVat; }
}
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVatValidationResult.cs
similarity index 90%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVatValidationResult.cs
index f490155ad..ca8a1bc5e 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVatValidationResult.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVatValidationResult.cs
@@ -1,6 +1,6 @@
using DotLiquid;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidVatValidationResult : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVendor.cs
similarity index 95%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVendor.cs
index 9421da9be..5503cda78 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendor.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVendor.cs
@@ -1,7 +1,7 @@
using DotLiquid;
using Grand.Domain.Vendors;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidVendor : Drop
{
diff --git a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVendorReview.cs
similarity index 92%
rename from src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
rename to src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVendorReview.cs
index 13a120723..b530f848b 100644
--- a/src/Business/Grand.Business.Messages/DotLiquidDrops/LiquidVendorReview.cs
+++ b/src/Business/Grand.Business.Core/Utilities/Messages/DotLiquidDrops/LiquidVendorReview.cs
@@ -1,7 +1,7 @@
using DotLiquid;
using Grand.Domain.Vendors;
-namespace Grand.Business.Messages.DotLiquidDrops
+namespace Grand.Business.Core.Utilities.Messages.DotLiquidDrops
{
public partial class LiquidVendorReview : Drop
{
diff --git a/src/Business/Grand.Business.System/Utilities/BestCustomerReportLine.cs b/src/Business/Grand.Business.Core/Utilities/System/BestCustomerReportLine.cs
similarity index 92%
rename from src/Business/Grand.Business.System/Utilities/BestCustomerReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/System/BestCustomerReportLine.cs
index 1744313da..8149f7700 100644
--- a/src/Business/Grand.Business.System/Utilities/BestCustomerReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/BestCustomerReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
diff --git a/src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs b/src/Business/Grand.Business.Core/Utilities/System/BestsellersReportLine.cs
similarity index 92%
rename from src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/System/BestsellersReportLine.cs
index b0a72503b..9ddf7583a 100644
--- a/src/Business/Grand.Business.System/Utilities/BestsellersReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/BestsellersReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// Represents a best sellers report line
diff --git a/src/Business/Grand.Business.System/Utilities/CustomerByTimeReportLine.cs b/src/Business/Grand.Business.Core/Utilities/System/CustomerByTimeReportLine.cs
similarity index 75%
rename from src/Business/Grand.Business.System/Utilities/CustomerByTimeReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/System/CustomerByTimeReportLine.cs
index afbeb3ece..14fcb1c30 100644
--- a/src/Business/Grand.Business.System/Utilities/CustomerByTimeReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/CustomerByTimeReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
public partial class CustomerByTimeReportLine
{
diff --git a/src/Business/Grand.Business.System/Utilities/DownloadUrl.cs b/src/Business/Grand.Business.Core/Utilities/System/DownloadUrl.cs
similarity index 91%
rename from src/Business/Grand.Business.System/Utilities/DownloadUrl.cs
rename to src/Business/Grand.Business.Core/Utilities/System/DownloadUrl.cs
index 009126783..b04740484 100644
--- a/src/Business/Grand.Business.System/Utilities/DownloadUrl.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/DownloadUrl.cs
@@ -1,6 +1,6 @@
using System.Net.Http;
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
public static class DownloadUrl
{
diff --git a/src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs b/src/Business/Grand.Business.Core/Utilities/System/InstallationLanguage.cs
similarity index 94%
rename from src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs
rename to src/Business/Grand.Business.Core/Utilities/System/InstallationLanguage.cs
index 243daa1d8..b1df6b8ed 100644
--- a/src/Business/Grand.Business.System/Utilities/InstallationLanguage.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/InstallationLanguage.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// Language class for installation process
diff --git a/src/Business/Grand.Business.System/Utilities/OrderAverageReportLine.cs b/src/Business/Grand.Business.Core/Utilities/System/OrderAverageReportLine.cs
similarity index 93%
rename from src/Business/Grand.Business.System/Utilities/OrderAverageReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/System/OrderAverageReportLine.cs
index 735a4d165..8cef1ec43 100644
--- a/src/Business/Grand.Business.System/Utilities/OrderAverageReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/OrderAverageReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// Represents an order average report line
diff --git a/src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs b/src/Business/Grand.Business.Core/Utilities/System/OrderAverageReportLineSummary.cs
similarity index 97%
rename from src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs
rename to src/Business/Grand.Business.Core/Utilities/System/OrderAverageReportLineSummary.cs
index 187125280..f50f2dbb2 100644
--- a/src/Business/Grand.Business.System/Utilities/OrderAverageReportLineSummary.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/OrderAverageReportLineSummary.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// Represents an order average report line summary
diff --git a/src/Business/Grand.Business.System/Utilities/OrderByCountryReportLine.cs b/src/Business/Grand.Business.Core/Utilities/System/OrderByCountryReportLine.cs
similarity index 92%
rename from src/Business/Grand.Business.System/Utilities/OrderByCountryReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/System/OrderByCountryReportLine.cs
index 27698dae1..8a32b822f 100644
--- a/src/Business/Grand.Business.System/Utilities/OrderByCountryReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/OrderByCountryReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// Represents an "order by country" report line
diff --git a/src/Business/Grand.Business.System/Utilities/OrderByTimeReportLine.cs b/src/Business/Grand.Business.Core/Utilities/System/OrderByTimeReportLine.cs
similarity index 85%
rename from src/Business/Grand.Business.System/Utilities/OrderByTimeReportLine.cs
rename to src/Business/Grand.Business.Core/Utilities/System/OrderByTimeReportLine.cs
index 58ef70bf6..ae851f431 100644
--- a/src/Business/Grand.Business.System/Utilities/OrderByTimeReportLine.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/OrderByTimeReportLine.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// Represents an "order by country" report line
diff --git a/src/Business/Grand.Business.System/Utilities/ProductsAttributeCombination.cs b/src/Business/Grand.Business.Core/Utilities/System/ProductsAttributeCombination.cs
similarity index 78%
rename from src/Business/Grand.Business.System/Utilities/ProductsAttributeCombination.cs
rename to src/Business/Grand.Business.Core/Utilities/System/ProductsAttributeCombination.cs
index 7f42247e6..30a6014bf 100644
--- a/src/Business/Grand.Business.System/Utilities/ProductsAttributeCombination.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/ProductsAttributeCombination.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
public class ProductsAttributeCombination : ProductAttributeCombination
{
diff --git a/src/Business/Grand.Business.System/Utilities/PropertyByName.cs b/src/Business/Grand.Business.Core/Utilities/System/PropertyByName.cs
similarity index 98%
rename from src/Business/Grand.Business.System/Utilities/PropertyByName.cs
rename to src/Business/Grand.Business.Core/Utilities/System/PropertyByName.cs
index 68593a906..09fc56f9a 100644
--- a/src/Business/Grand.Business.System/Utilities/PropertyByName.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/PropertyByName.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
/// <summary>
/// A helper class to access the property by name
diff --git a/src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs b/src/Business/Grand.Business.Core/Utilities/System/ReportPeriodOrder.cs
similarity index 78%
rename from src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs
rename to src/Business/Grand.Business.Core/Utilities/System/ReportPeriodOrder.cs
index 9c59a9402..31c4c4db1 100644
--- a/src/Business/Grand.Business.System/Utilities/ReportPeriodOrder.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/ReportPeriodOrder.cs
@@ -1,4 +1,4 @@
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
public partial class ReportPeriodOrder
{
diff --git a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs b/src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs
similarity index 99%
rename from src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs
rename to src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs
index 4e5b1f3a8..c63c2f068 100644
--- a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs
+++ b/src/Business/Grand.Business.Core/Utilities/System/StandardAdminSiteMap.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Admin;
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.Core.Utilities.System
{
public static class StandardAdminSiteMap
{
diff --git a/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs b/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
index be7ee4d68..a7c15a030 100644
--- a/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
+++ b/src/Business/Grand.Business.Customers/Commands/Handlers/ActiveVendorCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Customers.Commands.Models;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Events;
+using Grand.Business.Core.Commands.Customers;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Events.Customers;
using Grand.Domain.Customers;
using MediatR;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
namespace Grand.Business.Customers.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs b/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs
index df0dc2a0e..60cf909c0 100644
--- a/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs
+++ b/src/Business/Grand.Business.Customers/Extensions/NotificationsExtensions.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Customers.Events;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Utilities.Customers;
using MediatR;
namespace Grand.Business.Customers.Extensions
diff --git a/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj b/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj
index 7a994e9d7..4a9089b3c 100644
--- a/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj
+++ b/src/Business/Grand.Business.Customers/Grand.Business.Customers.csproj
@@ -4,7 +4,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.Business.Common\Grand.Business.Common.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
index ad5286217..7b5a1ab0c 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetCustomerQueryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Queries.Models;
+using Grand.Business.Core.Queries.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
index 5a78de938..06cc144bb 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetGroupBySystemNameQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Queries.Models;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Queries.Customers;
using Grand.Domain.Customers;
using MediatR;
diff --git a/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs b/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
index 1bbcfc472..33c574f70 100644
--- a/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
+++ b/src/Business/Grand.Business.Customers/Queries/Handlers/GetPasswordIsExpiredQueryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Queries.Models;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Queries.Customers;
using Grand.Domain.Customers;
using MediatR;
diff --git a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
index 1986bb1b9..7300b94f7 100644
--- a/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
+++ b/src/Business/Grand.Business.Customers/Services/AffiliateService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Affiliates;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs b/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs
index e585c57ed..028d76094 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerAttributeParser.cs
@@ -1,7 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
index 70f214d6e..82a342812 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerAttributeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
index 87cbfbcea..384a5c05e 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerHistoryPasswordService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
index 000a2735b..204adf6a5 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerManagerService.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.SharedKernel;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
index b12b381de..3682a2dbd 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerNoteService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Customers/Services/CustomerService.cs b/src/Business/Grand.Business.Customers/Services/CustomerService.cs
index 028c33508..372cbc261 100644
--- a/src/Business/Grand.Business.Customers/Services/CustomerService.cs
+++ b/src/Business/Grand.Business.Customers/Services/CustomerService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Queries.Models;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Queries.Customers;
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
index 26f928db1..8ab2ed2ca 100644
--- a/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
+++ b/src/Business/Grand.Business.Customers/Services/SalesEmployeeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Customers/Services/UserApiService.cs b/src/Business/Grand.Business.Customers/Services/UserApiService.cs
index ff709e602..143486f1a 100644
--- a/src/Business/Grand.Business.Customers/Services/UserApiService.cs
+++ b/src/Business/Grand.Business.Customers/Services/UserApiService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Customers/Services/VendorService.cs b/src/Business/Grand.Business.Customers/Services/VendorService.cs
index e94314499..cf45a2769 100644
--- a/src/Business/Grand.Business.Customers/Services/VendorService.cs
+++ b/src/Business/Grand.Business.Customers/Services/VendorService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs b/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs
index a4eb036ad..7cad4420d 100644
--- a/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Customers/Startup/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Customers.Services;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
diff --git a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs
index 3b52d6685..567e607b8 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventConditionCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Commands.Models;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Commands.Marketing;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs
index 548538147..bb1109bd9 100644
--- a/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Commands/Handlers/CustomerActionEventReactionCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Commands.Models;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Commands.Marketing;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Customers;
using Grand.Domain.Data;
@@ -11,7 +11,7 @@ using Grand.Domain.Messages;
using Grand.Domain.Orders;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
namespace Grand.Business.Marketing.Commands.Handlers
{
diff --git a/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs b/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs
index 7ca3a2ba1..acb5592d1 100644
--- a/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Events/AddToCartEventHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Events.ShoppingCart;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Events.Checkout.ShoppingCart;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using MediatR;
namespace Grand.Business.Marketing.Events
diff --git a/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs b/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs
index db302ce76..14632294e 100644
--- a/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Events/OrderPaidEventHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Domain.Customers;
using MediatR;
diff --git a/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs b/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs
index 01c703ee8..f406efcf7 100644
--- a/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs
+++ b/src/Business/Grand.Business.Marketing/Events/OrderPlacedEventHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
diff --git a/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs b/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
index 0e38e6e3a..3fc067075 100644
--- a/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
+++ b/src/Business/Grand.Business.Marketing/Extensions/NewsletterPublisherExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Events;
+using Grand.Business.Core.Events.Marketing;
using MediatR;
namespace Grand.Business.Marketing.Extensions
diff --git a/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj b/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj
index a403bf4ba..2ac20c3e9 100644
--- a/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj
+++ b/src/Business/Grand.Business.Marketing/Grand.Business.Marketing.csproj
@@ -4,9 +4,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.Business.Checkout\Grand.Business.Checkout.csproj" />
- <ProjectReference Include="..\Grand.Business.Common\Grand.Business.Common.csproj" />
- <ProjectReference Include="..\Grand.Business.Messages\Grand.Business.Messages.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs b/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs
index 0a931ec74..ef39f04c1 100644
--- a/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Banners/BannerService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Banners;
+using Grand.Business.Core.Interfaces.Marketing.Banners;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
diff --git a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
index 90c21b204..7d7102ce0 100644
--- a/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Campaigns/CampaignService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Campaigns;
-using Grand.Business.Messages.DotLiquidDrops;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Campaigns;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
index 15f6b0d4a..673ce1643 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeParser.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
index f353804a1..cc3502ae1 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactAttributeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Messages;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
index 6fee14153..db3393fed 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/ContactUsService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs
index 3b07051af..96e5f57ca 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/InteractiveFormService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
diff --git a/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs b/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs
index 8fe983a52..44005a335 100644
--- a/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Contacts/PopupService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
index 32a5d2923..a3db454f8 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseActionService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
index b358b80fc..cd15dae5d 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLessonService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
index d9f3771a3..5b6dfe744 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseLevelService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
index daf9b908c..243b83647 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Domain;
using Grand.Domain.Courses;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
index c7c18d6d7..d9f3fd453 100644
--- a/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Courses/CourseSubjectService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Courses;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs
index 4b3138f2f..624dca96a 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionEventService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Commands.Models;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Commands.Marketing;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs
index b8033abc0..f28160368 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerActionService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
index 623821fb5..a9aded952 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerCoordinatesService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Marketing.Events;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Events.Marketing;
using Grand.Infrastructure;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
index 32d374fe7..7a9b62b35 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerProductService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
index 28433b632..c3b86cf88 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerReminderService.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Messages.DotLiquidDrops;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Common;
@@ -17,6 +17,7 @@ using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel.Extensions;
using MediatR;
+using Grand.Business.Core.Utilities.Marketing;
namespace Grand.Business.Marketing.Services.Customers
{
@@ -1408,13 +1409,5 @@ namespace Grand.Business.Marketing.Services.Customers
#endregion
}
- public class SerializeCustomerReminderHistory
- {
- public string Id { get; set; }
- public string CustomerReminderId { get; set; }
- public string CustomerId { get; set; }
- public DateTime SendDate { get; set; }
- public int Level { get; set; }
- public string OrderId { get; set; }
- }
+
}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
index ac2c87b08..26b71b92f 100644
--- a/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Customers/CustomerTagService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
index 072155787..e3bcc5084 100644
--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Documents;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
index 9a7cf64ab..d32803017 100644
--- a/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Documents/DocumentTypeService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Documents;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Documents;
diff --git a/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs b/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
index 9e94284a3..9102a6595 100644
--- a/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Knowledgebase/KnowledgebaseService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
index 5c9567d5f..0dc3f81d0 100644
--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsLetterSubscriptionService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
index ddcd26989..a6d3b9cd0 100644
--- a/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/Newsletters/NewsletterCategoryService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Infrastructure.Extensions;
using Grand.Domain.Data;
using Grand.Domain.Messages;
diff --git a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
index 7e66b8273..b50dfd6cc 100644
--- a/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
+++ b/src/Business/Grand.Business.Marketing/Services/PushNotifications/PushNotificationsService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Marketing.Interfaces.PushNotifications;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Marketing.PushNotifications;
using Grand.Business.Marketing.Utilities;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs b/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs
index 69c77599f..bb49bbb2b 100644
--- a/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Marketing.Interfaces.Banners;
-using Grand.Business.Marketing.Interfaces.Campaigns;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Marketing.Interfaces.Courses;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Marketing.Interfaces.Documents;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Marketing.Interfaces.PushNotifications;
+using Grand.Business.Core.Interfaces.Marketing.Banners;
+using Grand.Business.Core.Interfaces.Marketing.Campaigns;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Marketing.PushNotifications;
using Grand.Business.Marketing.Services.Banners;
using Grand.Business.Marketing.Services.Campaigns;
using Grand.Business.Marketing.Services.Contacts;
diff --git a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
index 17da587e7..167c3f81c 100644
--- a/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
+++ b/src/Business/Grand.Business.Messages/Commands/Handlers/Common/InsertContactUsCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Commands.Models;
+using Grand.Business.Core.Commands.Messages;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using MediatR;
@@ -33,7 +33,6 @@ namespace Grand.Business.Messages.Commands.Handlers
};
await _repository.InsertAsync(contactus);
-
return true;
}
}
diff --git a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj
index b9cb0eba4..ed04188ef 100644
--- a/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj
+++ b/src/Business/Grand.Business.Messages/Grand.Business.Messages.csproj
@@ -4,8 +4,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.Business.Common\Grand.Business.Common.csproj" />
- <ProjectReference Include="..\Grand.Business.Storage\Grand.Business.Storage.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MailKit" Version="3.2.0" />
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
index d4285de9b..c3d959568 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetBidsByProductIdQueryHandler.cs
@@ -1,8 +1,9 @@
-using Grand.Domain.Catalog;
+using Grand.Business.Core.Queries.Messages;
+using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models.Handlers
+namespace Grand.Business.Messages.Queries.Handlers
{
public class GetBidsByProductIdQueryHandler : IRequestHandler<GetBidsByProductIdQuery, IList<Bid>>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
index 17c224fdb..1fcc0173b 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetCustomerByIdQueryHandler.cs
@@ -1,8 +1,9 @@
-using Grand.Domain.Customers;
+using Grand.Business.Core.Queries.Messages;
+using Grand.Domain.Customers;
using Grand.Domain.Data;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models.Handlers
+namespace Grand.Business.Messages.Queries.Handlers
{
public class GetCustomerByIdQueryHandler : IRequestHandler<GetCustomerByIdQuery, Customer>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
index 38c2df5e2..6db32d19f 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetProductByIdQueryHandler.cs
@@ -1,8 +1,9 @@
-using Grand.Domain.Catalog;
+using Grand.Business.Core.Queries.Messages;
+using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models.Handlers
+namespace Grand.Business.Messages.Queries.Handlers
{
public class GetProductByIdQueryHandler : IRequestHandler<GetProductByIdQuery, Product>
{
diff --git a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
index 7ed3ec896..12cf89974 100644
--- a/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
+++ b/src/Business/Grand.Business.Messages/Queries/Handlers/GetVendorByIdQueryHandler.cs
@@ -1,8 +1,9 @@
-using Grand.Domain.Data;
+using Grand.Business.Core.Queries.Messages;
+using Grand.Domain.Data;
using Grand.Domain.Vendors;
using MediatR;
-namespace Grand.Business.Messages.Queries.Models.Handlers
+namespace Grand.Business.Messages.Queries.Handlers
{
public class GetVendorByIdQueryHandler : IRequestHandler<GetVendorByIdQuery, Vendor>
{
diff --git a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
index b849b84fe..0bcdea214 100644
--- a/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
+++ b/src/Business/Grand.Business.Messages/Services/EmailAccountService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Messages/Services/EmailSender.cs b/src/Business/Grand.Business.Messages/Services/EmailSender.cs
index dce1eb19c..5fabc33b0 100644
--- a/src/Business/Grand.Business.Messages/Services/EmailSender.cs
+++ b/src/Business/Grand.Business.Messages/Services/EmailSender.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Messages;
using MailKit.Net.Smtp;
using MailKit.Security;
diff --git a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
index b352b9ed7..491cca6cd 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageProviderService.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
-using Grand.Business.Messages.Extensions;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Messages.Queries.Models;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Queries.Messages;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
index c3d9af3c8..0942b09f9 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageTemplateService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Data;
using Grand.Domain.Messages;
using Grand.Infrastructure.Caching;
diff --git a/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs b/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs
index dd787fc8c..0d8fb063a 100644
--- a/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs
+++ b/src/Business/Grand.Business.Messages/Services/MessageTokenProvider.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
namespace Grand.Business.Messages.Services
{
diff --git a/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs b/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs
index cb7858c0b..aa0690c67 100644
--- a/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs
+++ b/src/Business/Grand.Business.Messages/Services/MimeMappingService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Microsoft.AspNetCore.StaticFiles;
namespace Grand.Business.Messages.Services
diff --git a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
index 0d8fa3ace..1c7730806 100644
--- a/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
+++ b/src/Business/Grand.Business.Messages/Services/QueuedEmailService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure.Extensions;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs b/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs
index 9d0275538..b07e7270a 100644
--- a/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Messages/Startup/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.Messages.Services;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
diff --git a/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj b/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj
index 53952c943..916dc1b9a 100644
--- a/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj
+++ b/src/Business/Grand.Business.Storage/Grand.Business.Storage.csproj
@@ -4,7 +4,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.Business.Common\Grand.Business.Common.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.7.10.8" />
diff --git a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
index b51c51f9d..67cde7ad5 100644
--- a/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AmazonPictureService.cs
@@ -2,8 +2,8 @@
using Amazon.Runtime;
using Amazon.S3;
using Amazon.S3.Model;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Infrastructure;
diff --git a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
index ec6bbd8fe..259bd5ff0 100644
--- a/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/AzurePictureService.cs
@@ -1,6 +1,6 @@
using Azure.Storage.Blobs;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Infrastructure;
diff --git a/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs b/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs
index 78e952521..aaafb8033 100644
--- a/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs
+++ b/src/Business/Grand.Business.Storage/Services/DefaultMediaFileStore.cs
@@ -1,6 +1,6 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Microsoft.Extensions.FileProviders.Physical;
namespace Grand.Business.Storage.Services
diff --git a/src/Business/Grand.Business.Storage/Services/DownloadService.cs b/src/Business/Grand.Business.Storage/Services/DownloadService.cs
index e82451d24..68665c505 100644
--- a/src/Business/Grand.Business.Storage/Services/DownloadService.cs
+++ b/src/Business/Grand.Business.Storage/Services/DownloadService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Extensions;
diff --git a/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs b/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs
index e2836f7c7..9b82a9b39 100644
--- a/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs
+++ b/src/Business/Grand.Business.Storage/Services/FileSystemStore.cs
@@ -1,6 +1,6 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Microsoft.Extensions.FileProviders.Physical;
namespace Grand.Business.Storage.Services
diff --git a/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs b/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs
index b2c538e4e..21d4aa62b 100644
--- a/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs
+++ b/src/Business/Grand.Business.Storage/Services/FileSystemStoreEntry.cs
@@ -1,5 +1,5 @@
//Source https://github.com/OrchardCMS/OrchardCore/tree/dev/src/OrchardCore
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Microsoft.Extensions.FileProviders;
namespace Grand.Business.Storage.Services
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.cs
index 0ac243691..e099c331c 100644
--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs
+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain;
using Grand.Domain.Common;
using Grand.Domain.Data;
@@ -796,6 +796,28 @@ namespace Grand.Business.Storage.Services
return byteArray;
}
}
+
+
+
+ /// <summary>
+ /// Convert picture
+ /// </summary>
+ /// <param name="pictureBinary">Picture binary</param>
+ /// <param name="imageQuality">Image quality</param>
+ /// <param name="format">Format</param>
+ /// <returns>Picture binary or throws an exception</returns>
+ public virtual byte[] ConvertPicture(byte[] pictureBinary, int imageQuality, string format = "Webp")
+ {
+ Enum.TryParse(typeof(SKEncodedImageFormat), format, out var skformat);
+ if (skformat == null)
+ skformat = SKEncodedImageFormat.Webp;
+
+ using var image = SKBitmap.Decode(pictureBinary);
+ SKData d = SKImage.FromBitmap(image).Encode((SKEncodedImageFormat)skformat, imageQuality);
+ return d.ToArray();
+ }
+
+
protected SKEncodedImageFormat EncodedImageFormat(string mimetype)
{
SKEncodedImageFormat defaultFormat = SKEncodedImageFormat.Jpeg;
diff --git a/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs b/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs
index 9cdd7692d..ac2ca46f2 100644
--- a/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.Storage/Startup/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Business.Storage.Services;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
index ad2c27405..4b228418a 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
index bdedaa6d2..6bf94cbc9 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Messages;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Catalog
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
index efbeb2706..ddc230151 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using MediatR;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
index cb48b3c04..1e9896339 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Commands.Models.Common;
+using Grand.Business.Core.Commands.System.Common;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using MediatR;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs
index a9a1b3ea8..2606b2712 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/DeleteActivitylogCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Commands.Models.Common;
+using Grand.Business.Core.Commands.System.Common;
using Grand.Domain.Data;
using Grand.Domain.Logging;
using MediatR;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
index 8ae3d6ba9..724ca07eb 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Commands.Models.Common;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Commands.System.Common;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
index 2e5b109c4..e425d2627 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
index 91b9b2cee..e99c781cd 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
index 9ce65c081..62d1d2fa8 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
index b5ba9fc72..10780d0ea 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
index 912bee66b..decc38a35 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
@@ -1,16 +1,14 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Shipping;
using Grand.Domain.Tax;
using Grand.Domain.Vendors;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
index 5ead94141..0e3768000 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
index b6eb06d81..8e3a1fa86 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
+using Grand.Business.Core.Interfaces.Storage;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
index 038458e55..8e7be05f8 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Stores;
using MediatR;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
index 29949a4a5..325bc9e71 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Messages.Commands.Models;
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Commands.Messages;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Messages
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
index d9f188372..01a9a4200 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallNewPermissionsCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.System.Commands.Models.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Commands.System.Security;
using Grand.Domain.Permissions;
using MediatR;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
index 6f225879d..a9a937633 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/InstallPermissionsCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.System.Commands.Models.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Commands.System.Security;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
using MediatR;
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs
index cfcc7ea08..914267f18 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Security/UninstallPermissionsCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.System.Commands.Models.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Commands.System.Security;
using MediatR;
namespace Grand.Business.System.Commands.Handlers.Security
diff --git a/src/Business/Grand.Business.System/Grand.Business.System.csproj b/src/Business/Grand.Business.System/Grand.Business.System.csproj
index 5fa19c989..d29cfe56f 100644
--- a/src/Business/Grand.Business.System/Grand.Business.System.csproj
+++ b/src/Business/Grand.Business.System/Grand.Business.System.csproj
@@ -4,14 +4,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.Business.Catalog\Grand.Business.Catalog.csproj" />
- <ProjectReference Include="..\Grand.Business.Checkout\Grand.Business.Checkout.csproj" />
- <ProjectReference Include="..\Grand.Business.Common\Grand.Business.Common.csproj" />
- <ProjectReference Include="..\Grand.Business.Cms\Grand.Business.Cms.csproj" />
- <ProjectReference Include="..\Grand.Business.Customers\Grand.Business.Customers.csproj" />
- <ProjectReference Include="..\Grand.Business.Marketing\Grand.Business.Marketing.csproj" />
- <ProjectReference Include="..\Grand.Business.Messages\Grand.Business.Messages.csproj" />
- <ProjectReference Include="..\Grand.Business.Storage\Grand.Business.Storage.csproj" />
+ <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NPOI" Version="2.5.5" />
diff --git a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs
index be01ef655..857a0b05e 100644
--- a/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs
+++ b/src/Business/Grand.Business.System/Services/Admin/AdminSiteMapService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.System.Interfaces.Admin;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.System.Admin;
+using Grand.Business.Core.Utilities.System;
using Grand.Infrastructure.Caching;
using Grand.Domain.Admin;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
index b2825ecdd..86c509941 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Common;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
index 59ab87288..d8b7fff09 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Infrastructure.Caching;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs
index f96cd629f..29cc34121 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearLogScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs
index ef2b3a0ea..ae6506437 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderAbandonedCartScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs
index dd02544fa..9301ffe26 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderBirthdayScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs
index 16ac748a1..46e58c106 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderCompletedOrderScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs
index f407cc7bf..9dd15b330 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastActivityScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs
index f61f719de..7f9dd75a7 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderLastPurchaseScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs
index 7a9d966de..9886f8c02 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderRegisteredCustomerScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs
index c38d60f9e..b5f8570c3 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CustomerReminderUnpaidOrderScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
index 7fb6c45fe..026438059 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Common;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
index 4a25a8b2c..eccbe3b00 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Localization;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
index 1685d0c3a..20f5007cf 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Commands.Models.Common;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Commands.System.Common;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using MediatR;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
index 3728b4c4a..9a2cdc43a 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.System.Interfaces.ScheduleTasks;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
index 6421401d2..d8073f277 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Data;
using Grand.Domain.Tasks;
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
index 04d26ac30..b621dc547 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
+++ b/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Directory;
using Grand.Domain.Tasks;
diff --git a/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs b/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs
index 687d06793..3eb7d11bd 100644
--- a/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs
+++ b/src/Business/Grand.Business.System/Services/ExportImport/ExportManager.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.ExportImport;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -19,6 +19,7 @@ using Grand.Infrastructure.Extensions;
using Microsoft.Extensions.DependencyInjection;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
+using Grand.Business.System.Utilities.System;
namespace Grand.Business.System.Services.ExportImport
{
diff --git a/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs b/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs
index 782627989..29d0350e1 100644
--- a/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs
+++ b/src/Business/Grand.Business.System/Services/ExportImport/ImportManager.cs
@@ -1,20 +1,20 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.ExportImport;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Domain.Media;
@@ -26,6 +26,7 @@ using Grand.Domain.Tax;
using Grand.SharedKernel;
using Microsoft.AspNetCore.StaticFiles;
using NPOI.XSSF.UserModel;
+using Grand.Business.System.Utilities.System;
namespace Grand.Business.System.Services.ExportImport
{
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs
index 5df7b1b7b..29b160716 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataActivityLogTypes.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Logging;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs
index 5495f2e4d..c97d332b4 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataAffiliates.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Affiliates;
using Grand.Domain.Common;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs
index a196b2707..abd5e9b7e 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBlogPosts.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Blogs;
using Grand.Domain.Seo;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs
index ee634c2db..9ff3c6735 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrandLayouts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs
index 080d1d79e..9a79f2a43 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataBrands.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Seo;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs
index 13cafbae6..7c352d25a 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategories.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Seo;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs
index 29aa7fd5b..3759a0b3e 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCategoryLayouts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs
index fae015768..7155a233a 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCheckoutAttributes.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs
index 6cecf8e18..48ca23133 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCollectionLayouts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs
index 5d29ca3fa..8cb466bae 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCountriesAndStates.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Directory;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs
index 93b963af1..429704475 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCurrencies.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Directory;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs
index d89b46d03..f9446a10b 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomerActions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Customers;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
index 52c4e2a58..c646c74e1 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataCustomersAndUsers.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs
index a7d05db2d..24567249f 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataDeliveryDates.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Shipping;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs
index a27d49bbd..b86707c9e 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataDiscounts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Discounts;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs
index be450e4b3..e9544640f 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataEmailAccounts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Messages;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs
index e24197ede..08b4a3e88 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataLanguages.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Localization;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs
index 685ee321e..589e47e87 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataLocaleResources.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.SharedKernel.Extensions;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs
index e2226794b..1562ed488 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMeasures.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Directory;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs
index a628f4ce9..a8c39f2cd 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Orders;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs
index 4e2af867f..f193f5fc0 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnReasons.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Orders;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
index 1923b39a7..19be10ce3 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMessageTemplates.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Messages;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs
index be6e4d4d9..a1dd31934 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataNews.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.News;
using Grand.Domain.Seo;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs
index da47867aa..fb2c04b7b 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderStatus.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Orders;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs
index ca65752f9..614a5c920 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataOrderTags.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Orders;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs
index ca87c9612..e31bc2c02 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPageLayouts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Pages;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs
index 74d859ed1..fa80cb305 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPages.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Pages;
using Grand.Domain.Seo;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs
index 167718c20..b28b0b147 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataPickupPoints.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs
index 3dfb9d664..1d5c4931f 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductAttributes.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs
index a900c7e1f..541c64c37 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProductLayouts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
index 812ba9ba7..b3955a840 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Seo;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs
index e8273163c..fcce56131 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataRobotsTxt.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Common;
using Grand.Domain.Stores;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
index c243663cc..9c5b9bb78 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataScheduleTasks.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Tasks;
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.cs
index 47df64678..783bb8b75 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.AdminSearch;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs
index d9cf76053..1b6fc6e6c 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataShippingMethods.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Shipping;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs
index 8b63d01e2..476fe29e3 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSpecificationAttributes.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Catalog;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
index 7b0c43ab4..a4ddc6528 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataStores.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Stores;
using Microsoft.AspNetCore.Http;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs
index 6c82caa22..55f6a03dd 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataTaxCategories.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Tax;
namespace Grand.Business.System.Services.Installation
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs
index 12f4c5a44..9c63c8467 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataVendors.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Seo;
using Grand.Domain.Vendors;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs
index 1680889ed..480e73660 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataWarehouses.cs
@@ -1,4 +1,4 @@
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs
index 748b308a8..914bea97d 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationLocalizedService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.System.Interfaces.Installation;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.System.Installation;
+using Grand.Business.Core.Utilities.System;
using Grand.SharedKernel.Extensions;
using System.Text.RegularExpressions;
using System.Xml;
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
index 3d055a8ba..7e428ffbd 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
-using Grand.Business.System.Interfaces.Installation;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
+using Grand.Business.Core.Interfaces.System.Installation;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain;
using Grand.Domain.Admin;
using Grand.Domain.Affiliates;
diff --git a/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs b/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs
index c38cca8a9..ee216975c 100644
--- a/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs
+++ b/src/Business/Grand.Business.System/Services/MachineNameProvider/AzureWebAppsMachineNameProvider.cs
@@ -1,5 +1,5 @@
//Contribution: Orchard project (http://www.orchardproject.net/)
-using Grand.Business.System.Interfaces.MachineNameProvider;
+using Grand.Business.Core.Interfaces.System.MachineNameProvider;
namespace Grand.Business.System.Services.MachineNameProvider
{
diff --git a/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs b/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs
index ab224ba89..b3f27290e 100644
--- a/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs
+++ b/src/Business/Grand.Business.System/Services/MachineNameProvider/DefaultMachineNameProvider.cs
@@ -1,5 +1,5 @@
//Contribution: Orchard project (http://www.orchardproject.net/)
-using Grand.Business.System.Interfaces.MachineNameProvider;
+using Grand.Business.Core.Interfaces.System.MachineNameProvider;
namespace Grand.Business.System.Services.MachineNameProvider
{
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
index 6146c938e..e704e0c5e 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Permissions;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
index ed1df76b2..d7d0a2e7a 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
index 03663fe59..cc5c3cea3 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Data;
using Grand.Domain.Stores;
using Grand.Infrastructure.Migrations;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
index 90a11b024..d27d52b2a 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Data;
using Grand.Domain.Media;
using Grand.Infrastructure.Migrations;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
index f4cbb0f53..a32342774 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Data;
using Grand.Domain.Stores;
using Grand.Infrastructure.Migrations;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
index 9ac540ca9..90fbd365a 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
index c77e4748b..576a1f3bd 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Data;
using Grand.Domain.Localization;
using Grand.SharedKernel.Extensions;
diff --git a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs
index 8657a24fc..a657d3638 100644
--- a/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs
+++ b/src/Business/Grand.Business.System/Services/Reports/CustomerReportService.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.System.Interfaces.Reports;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs
index ff8b9eb0c..06674d9c1 100644
--- a/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs
+++ b/src/Business/Grand.Business.System/Services/Reports/OrderReportService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.System.Interfaces.Reports;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs b/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs
index ab6c0f249..1eeacd3be 100644
--- a/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs
+++ b/src/Business/Grand.Business.System/Services/Reports/ProductsReportService.cs
@@ -1,5 +1,5 @@
-using Grand.Business.System.Interfaces.Reports;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
diff --git a/src/Business/Grand.Business.System/Startup/StartupApplication.cs b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
index 6926d6974..d2e8ddf1b 100644
--- a/src/Business/Grand.Business.System/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
@@ -1,9 +1,9 @@
-using Grand.Business.System.Interfaces.Admin;
-using Grand.Business.System.Interfaces.ExportImport;
-using Grand.Business.System.Interfaces.Installation;
-using Grand.Business.System.Interfaces.MachineNameProvider;
-using Grand.Business.System.Interfaces.Reports;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.System.Admin;
+using Grand.Business.Core.Interfaces.System.ExportImport;
+using Grand.Business.Core.Interfaces.System.Installation;
+using Grand.Business.Core.Interfaces.System.MachineNameProvider;
+using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Business.System.Services.Admin;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Business.System.Services.ExportImport;
diff --git a/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs b/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs
index 534878b5f..ef77ad71c 100644
--- a/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs
+++ b/src/Business/Grand.Business.System/Utilities/PropertyHelperList.cs
@@ -1,6 +1,6 @@
using NPOI.SS.UserModel;
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.System.Utilities.System
{
public class PropertyHelperList<T>
{
diff --git a/src/Business/Grand.Business.System/Utilities/PropertyManager.cs b/src/Business/Grand.Business.System/Utilities/PropertyManager.cs
index ae49678f5..2f5646660 100644
--- a/src/Business/Grand.Business.System/Utilities/PropertyManager.cs
+++ b/src/Business/Grand.Business.System/Utilities/PropertyManager.cs
@@ -1,6 +1,7 @@
-using NPOI.SS.UserModel;
+using Grand.Business.Core.Utilities.System;
+using NPOI.SS.UserModel;
-namespace Grand.Business.System.Utilities
+namespace Grand.Business.System.Utilities.System
{
/// <summary>
/// Class for working with PropertyByName object list
diff --git a/src/Business/Grand.Business.Common/Services/Directory/DateTimeSettings.cs b/src/Core/Grand.Domain/Directory/DateTimeSettings.cs
similarity index 82%
rename from src/Business/Grand.Business.Common/Services/Directory/DateTimeSettings.cs
rename to src/Core/Grand.Domain/Directory/DateTimeSettings.cs
index 6f7a4128b..8574e69aa 100644
--- a/src/Business/Grand.Business.Common/Services/Directory/DateTimeSettings.cs
+++ b/src/Core/Grand.Domain/Directory/DateTimeSettings.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Configuration;
-namespace Grand.Business.Common.Interfaces.Directory
+namespace Grand.Domain.Directory
{
public class DateTimeSettings : ISettings
{
diff --git a/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs b/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs
index d6208c8dc..cd4059b84 100644
--- a/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs
+++ b/src/Plugins/Authentication.Facebook/Areas/Admin/Controllers/FacebookAuthenticationSettingsController.cs
@@ -1,8 +1,8 @@
using Authentication.Facebook.Models;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
index 45c42027d..7ff7d3898 100644
--- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
+++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
@@ -31,36 +31,6 @@
</Target>
<ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
<Private>false</Private>
</ProjectReference>
@@ -73,6 +43,9 @@
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
<Private>false</Private>
</ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs b/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs
index 891c41815..fb7c05084 100644
--- a/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs
+++ b/src/Plugins/Authentication.Facebook/Controllers/FacebookAuthenticationController.cs
@@ -1,6 +1,5 @@
using Authentication.Facebook.Models;
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Authentication.Utilities;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.SharedKernel;
using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Authentication;
@@ -8,6 +7,7 @@ using Microsoft.AspNetCore.Authentication.Facebook;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using System.Security.Claims;
+using Grand.Business.Core.Utilities.Authentication;
namespace Authentication.Facebook.Controllers
{
diff --git a/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs b/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs
index 097170377..b017cfde9 100644
--- a/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs
+++ b/src/Plugins/Authentication.Facebook/FacebookAuthenticationPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Authentication.Facebook
diff --git a/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs b/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs
index 46e9d1abc..26e25007b 100644
--- a/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs
+++ b/src/Plugins/Authentication.Facebook/FacebookAuthenticationProvider.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
namespace Authentication.Facebook
{
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs b/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
index acc2c2991..74fb3520f 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/Cache/FacebookAuthenticationEventConsumer.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Authentication.Events;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Customers;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
@@ -11,7 +11,7 @@ namespace Authentication.Facebook.Infrastructure.Cache
/// <summary>
/// Facebook authentication event consumer (used for saving customer fields on registration)
/// </summary>
- public partial class FacebookAuthenticationEventConsumer : INotificationHandler<RegisteredByExternalMethodEventHandler>
+ public partial class FacebookAuthenticationEventConsumer : INotificationHandler<RegisteredByExternalMethod>
{
#region Fields
@@ -40,7 +40,7 @@ namespace Authentication.Facebook.Infrastructure.Cache
#region Methods
- public async Task Handle(RegisteredByExternalMethodEventHandler eventMessage, CancellationToken cancellationToken)
+ public async Task Handle(RegisteredByExternalMethod eventMessage, CancellationToken cancellationToken)
{
if (eventMessage?.Customer == null || eventMessage.AuthenticationParameters == null)
return;
@@ -63,7 +63,7 @@ namespace Authentication.Facebook.Infrastructure.Cache
await _messageProviderService.SendCustomerRegisteredMessage(eventMessage.Customer, _workContext.CurrentStore, _workContext.WorkingLanguage.Id);
//send welcome message
- if(eventMessage.RegistrationResult.Success)
+ if (eventMessage.RegistrationResult.Success)
await _messageProviderService.SendCustomerWelcomeMessage(eventMessage.Customer, _workContext.CurrentStore, _workContext.WorkingLanguage.Id);
}
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
index ba78beb21..22d1b83ad 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/FacebookAuthenticationBuilder.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Facebook;
using Microsoft.AspNetCore.Authentication.OAuth;
diff --git a/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs b/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs
index 2c4531a45..e38852ff8 100644
--- a/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs
+++ b/src/Plugins/Authentication.Facebook/Infrastructure/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs b/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
index 53d079cfa..b29bcfe03 100644
--- a/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
+++ b/src/Plugins/Authentication.Google/Areas/Admin/Controllers/GoogleAuthenticationSettingsController.cs
@@ -1,8 +1,8 @@
using Authentication.Google.Models;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csproj
index 09edf5f70..70ed644ad 100644
--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj
+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj
@@ -30,37 +30,7 @@
</Target>
<ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
@@ -72,6 +42,9 @@
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
<Private>false</Private>
</ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs b/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs
index 51820dc5d..272b72e97 100644
--- a/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs
+++ b/src/Plugins/Authentication.Google/Controllers/GoogleAuthenticationController.cs
@@ -1,6 +1,5 @@
using Authentication.Google.Models;
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Authentication.Utilities;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.SharedKernel;
using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Authentication;
@@ -8,6 +7,7 @@ using Microsoft.AspNetCore.Authentication.Google;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using System.Security.Claims;
+using Grand.Business.Core.Utilities.Authentication;
namespace Authentication.Google.Controllers
{
diff --git a/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs b/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs
index d89f74f8c..be7fdd2f3 100644
--- a/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs
+++ b/src/Plugins/Authentication.Google/GoogleAuthenticationPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Authentication.Google
diff --git a/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs b/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs
index 26615cd3d..5e4f04569 100644
--- a/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs
+++ b/src/Plugins/Authentication.Google/GoogleAuthenticationProvider.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
namespace Authentication.Google
{
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
index 5a214c355..5b76750ec 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationBuilder.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Domain.Configuration;
using Grand.Domain.Data;
using Grand.Domain.Data.Mongo;
diff --git a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
index 506769f67..f0cbcc5c2 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/GoogleAuthenticationEventConsumer.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Authentication.Events;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Customers;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using MediatR;
@@ -11,7 +11,7 @@ namespace Authentication.Google.Infrastructure.Cache
/// <summary>
/// Google authentication event consumer (used for saving customer fields on registration)
/// </summary>
- public partial class GoogleAuthenticationEventConsumer : INotificationHandler<RegisteredByExternalMethodEventHandler>
+ public partial class GoogleAuthenticationEventConsumer : INotificationHandler<RegisteredByExternalMethod>
{
#region Fields
@@ -42,7 +42,7 @@ namespace Authentication.Google.Infrastructure.Cache
#region Methods
- public async Task Handle(RegisteredByExternalMethodEventHandler eventMessage, CancellationToken cancellationToken)
+ public async Task Handle(RegisteredByExternalMethod eventMessage, CancellationToken cancellationToken)
{
if (eventMessage?.Customer == null || eventMessage.AuthenticationParameters == null)
return;
diff --git a/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs b/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs
index e18b147c7..be50e03e5 100644
--- a/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs
+++ b/src/Plugins/Authentication.Google/Infrastructure/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
index 4f4ace08c..3c0a16a61 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/CustomerGroupsController.cs
@@ -1,10 +1,10 @@
using DiscountRules.CustomerGroups.Models;
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Discounts;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
index bc1216a89..3e7c21643 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HadSpentAmountController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Domain.Discounts;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
index 781326dea..ee4fe9815 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasAllProductsController.cs
@@ -1,13 +1,13 @@
using DiscountRules.HasAllProducts.Models;
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Infrastructure;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
index 81a551caf..b3d56c92c 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/HasOneProductController.cs
@@ -1,13 +1,13 @@
using DiscountRules.HasOneProduct.Models;
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Infrastructure;
diff --git a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
index 66b1c9917..777fbc095 100644
--- a/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
+++ b/src/Plugins/DiscountRules.Standard/Areas/Admin/Controllers/ShoppingCartAmountController.cs
@@ -1,8 +1,8 @@
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Domain.Discounts;
diff --git a/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs b/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs
index 1a376b929..f35561ba0 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs
+++ b/src/Plugins/DiscountRules.Standard/DiscountPlugin.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace DiscountRules.Standard
diff --git a/src/Plugins/DiscountRules.Standard/DiscountProvider.cs b/src/Plugins/DiscountRules.Standard/DiscountProvider.cs
index ddef0452b..c669d6d36 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountProvider.cs
+++ b/src/Plugins/DiscountRules.Standard/DiscountProvider.cs
@@ -1,5 +1,5 @@
using DiscountRules.Provider;
-using Grand.Business.Catalog.Interfaces.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
namespace DiscountRules.Standard
{
diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
index 8e0c1a7b1..24f3374c6 100644
--- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
+++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj
@@ -20,36 +20,6 @@
</Target>
<ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
<Private>false</Private>
</ProjectReference>
@@ -62,6 +32,9 @@
<ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
<Private>false</Private>
</ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Update="logo.jpg">
diff --git a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
index 56c6d8e74..747cc22fd 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/CustomerGroupDiscountRule.cs
@@ -1,7 +1,7 @@
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Configuration;
namespace DiscountRules.Provider
{
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
index 82735e95c..f85d9cbf1 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HadSpentAmountDiscountRule.cs
@@ -1,9 +1,9 @@
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
namespace DiscountRules.Provider
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
index 528aaf6df..04ec233ec 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasAllProductsDiscountRule.cs
@@ -1,8 +1,8 @@
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
namespace DiscountRules.Provider
diff --git a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
index 2ae3b9598..928e91a35 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/HasOneProductDiscountRule.cs
@@ -1,8 +1,8 @@
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
namespace DiscountRules.Provider
diff --git a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
index 6be83f532..1794eb029 100644
--- a/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
+++ b/src/Plugins/DiscountRules.Standard/Providers/ShoppingCartDiscountRule.cs
@@ -1,10 +1,10 @@
using DiscountRules.Standard.Models;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Plugins/DiscountRules.Standard/StartupApplication.cs b/src/Plugins/DiscountRules.Standard/StartupApplication.cs
index d3cc3a843..703c61e3f 100644
--- a/src/Plugins/DiscountRules.Standard/StartupApplication.cs
+++ b/src/Plugins/DiscountRules.Standard/StartupApplication.cs
@@ -1,5 +1,5 @@
using DiscountRules.Provider;
-using Grand.Business.Catalog.Interfaces.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj
index 48a5dd9fa..1ce596626 100644
--- a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj
+++ b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj
@@ -1,70 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\..\Build\Grand.Common.props" />
-
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\ref" />
- </Target>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\ExchangeRate.McExchange\ref" />
+ </Target>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
diff --git a/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs b/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs
index d4b8da6e2..482004eea 100644
--- a/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs
+++ b/src/Plugins/ExchangeRate.McExchange/McExchangeRateProvider.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Providers;
+using Grand.Business.Core.Interfaces.Common.Providers;
using Grand.SharedKernel;
using System.Net.Http;
diff --git a/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs b/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs
index 1c510c5c9..9a7ba9062 100644
--- a/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs
+++ b/src/Plugins/ExchangeRate.McExchange/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Providers;
+using Grand.Business.Core.Interfaces.Common.Providers;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs b/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs
index 5fe4076e5..be6e8aaed 100644
--- a/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs
+++ b/src/Plugins/Payments.BrainTree/Areas/Admin/Controllers/PaymentBrainTreeController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs
index dcfa1819d..a3cb38c4a 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Payments.BrainTree
diff --git a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
index 0ebc15986..97d02df3d 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreePaymentProvider.cs
@@ -1,11 +1,11 @@
using Braintree;
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Infrastructure;
diff --git a/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs b/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs
index fc1eb45c2..612cda578 100644
--- a/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs
+++ b/src/Plugins/Payments.BrainTree/BrainTreeWidgetProvider.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Localization;
namespace Payments.BrainTree
{
diff --git a/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs b/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs
index d9b00a185..d9fb66123 100644
--- a/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs
+++ b/src/Plugins/Payments.BrainTree/Components/PaymentBrainTreeViewComponent.cs
@@ -1,6 +1,6 @@
using Braintree;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Common.Components;
using Grand.Domain.Orders;
using Grand.Infrastructure;
diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj
index 2b51247c3..b1b5b2fb2 100644
--- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj
+++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj
@@ -1,86 +1,59 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.BrainTree\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.BrainTree\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.BrainTree\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.BrainTree\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\ref" />
- </Target>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\ref" />
+ </Target>
- <ItemGroup>
- <PackageReference Include="Braintree" Version="5.12.0" />
- <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
- </ItemGroup>
-
- <Target Name="CopyFile" AfterTargets="AfterBuild">
- <ItemGroup>
- <CopyFiles Include="$(NuGetPackageRoot)\braintree\5.12.0\lib\netstandard2.0\*.*" />
- <CopyFiles Include="$(NuGetPackageRoot)\system.xml.xpath.xmldocument\4.3.0\lib\netstandard1.3\*.*" />
- </ItemGroup>
- <Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\" />
- </Target>
+ <ItemGroup>
+ <PackageReference Include="Braintree" Version="5.12.0" />
+ <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+ </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <Target Name="CopyFile" AfterTargets="AfterBuild">
+ <ItemGroup>
+ <CopyFiles Include="$(NuGetPackageRoot)\braintree\5.12.0\lib\netstandard2.0\*.*" />
+ <CopyFiles Include="$(NuGetPackageRoot)\system.xml.xpath.xmldocument\4.3.0\lib\netstandard1.3\*.*" />
+ </ItemGroup>
+ <Copy SourceFiles="@(CopyFiles)" DestinationFolder="..\..\Web\Grand.Web\Plugins\Payments.BrainTree\" />
+ </Target>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
diff --git a/src/Plugins/Payments.BrainTree/StartupApplication.cs b/src/Plugins/Payments.BrainTree/StartupApplication.cs
index 3539c2363..c5e3e1672 100644
--- a/src/Plugins/Payments.BrainTree/StartupApplication.cs
+++ b/src/Plugins/Payments.BrainTree/StartupApplication.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Payments.BrainTree/Validators/PaymentInfoValidator.cs b/src/Plugins/Payments.BrainTree/Validators/PaymentInfoValidator.cs
index 2df91f47b..aa95816e3 100644
--- a/src/Plugins/Payments.BrainTree/Validators/PaymentInfoValidator.cs
+++ b/src/Plugins/Payments.BrainTree/Validators/PaymentInfoValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Payments.BrainTree.Models;
namespace Payments.BrainTree.Validators
diff --git a/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs b/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
index d8e0d8dcb..56f639617 100644
--- a/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Areas/Admin/Controllers/PaymentCashOnDeliveryController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs
index 0f1f96842..d75320def 100644
--- a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs
+++ b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Payments.CashOnDelivery
diff --git a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
index 6809b7480..ea8afaa78 100644
--- a/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
+++ b/src/Plugins/Payments.CashOnDelivery/CashOnDeliveryPaymentProvider.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Infrastructure;
diff --git a/src/Plugins/Payments.CashOnDelivery/Components/PaymentCashOnDeliveryViewComponent.cs b/src/Plugins/Payments.CashOnDelivery/Components/PaymentCashOnDeliveryViewComponent.cs
index ab92a1ac7..d5a6aafc9 100644
--- a/src/Plugins/Payments.CashOnDelivery/Components/PaymentCashOnDeliveryViewComponent.cs
+++ b/src/Plugins/Payments.CashOnDelivery/Components/PaymentCashOnDeliveryViewComponent.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
index 26e52a0d0..b8a48cb90 100644
--- a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
+++ b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\ref" />
- </Target>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\ref" />
+ </Target>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.CashOnDelivery\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs b/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs
index ad3f74902..e6782c51b 100644
--- a/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs
+++ b/src/Plugins/Payments.CashOnDelivery/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs b/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs
index 604f5f147..e165738e0 100644
--- a/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs
+++ b/src/Plugins/Payments.PayPalStandard/Areas/Admin/Controllers/PayPalStandardController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs b/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs
index 498f3615f..0762b221c 100644
--- a/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs
+++ b/src/Plugins/Payments.PayPalStandard/Controllers/PaymentPayPalStandardController.cs
@@ -1,10 +1,9 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Infrastructure;
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs
index 5e7191cb4..156d864e2 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Payments.PayPalStandard
diff --git a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
index e34ff4702..cce9eacca 100644
--- a/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
+++ b/src/Plugins/Payments.PayPalStandard/PayPalStandardPaymentProvider.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
diff --git a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj
index 1d35bb522..2b5e210c3 100644
--- a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj
+++ b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj
@@ -1,74 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\ref" />
- </Target>
-
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\ref" />
+ </Target>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs b/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs
index 53dd72592..843c041da 100644
--- a/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs
+++ b/src/Plugins/Payments.PayPalStandard/Services/PaypalHttpClient.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using System.Net.Http;
namespace Payments.PayPalStandard.Services
diff --git a/src/Plugins/Payments.PayPalStandard/StartupApplication.cs b/src/Plugins/Payments.PayPalStandard/StartupApplication.cs
index 43501a8db..e1b06ad8a 100644
--- a/src/Plugins/Payments.PayPalStandard/StartupApplication.cs
+++ b/src/Plugins/Payments.PayPalStandard/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs b/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs
index 319a3a072..4e79c1079 100644
--- a/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs
+++ b/src/Plugins/Shipping.ByWeight/Areas/Admin/Controllers/ShippingByWeightController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
using Shipping.ByWeight.Domain;
using Shipping.ByWeight.Models;
using Shipping.ByWeight.Services;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Shipping.ByWeight.Controllers
{
diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs
index dd0984888..a2d1e055e 100644
--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs
+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
using Grand.Infrastructure.Plugins;
diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
index 513f58dd1..20e44bd2d 100644
--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingProvider.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
index 9f656639a..ce75fe3ac 100644
--- a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
+++ b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\ref" />
- </Target>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\ref" />
+ </Target>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ByWeight/StartupApplication.cs b/src/Plugins/Shipping.ByWeight/StartupApplication.cs
index 2f5639f23..3d0f4f745 100644
--- a/src/Plugins/Shipping.ByWeight/StartupApplication.cs
+++ b/src/Plugins/Shipping.ByWeight/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs b/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
index e7d04b513..9fa3efdb6 100644
--- a/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/Areas/Admin/Controllers/ShippingFixedRateController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs
index 82fabd6fe..12cfde7b2 100644
--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Shipping.FixedRateShipping
diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
index 9eb7e14f4..0d5d468cc 100644
--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingProvider.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure;
diff --git a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj
index d21b273fb..6357fe55e 100644
--- a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj
+++ b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
-
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping\ref" />
- </Target>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.FixedRateShipping\ref" />
+ </Target>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
diff --git a/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs b/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs
index 6004d221b..8672760ae 100644
--- a/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs
+++ b/src/Plugins/Shipping.FixedRateShipping/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
index 7938b1978..87fd9f476 100644
--- a/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Areas/Admin/Controllers/ShippingPointController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs b/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs
index aea032d06..f21278990 100644
--- a/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Components/SelectedShippingPointViewComponent.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs b/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs
index f343b77f9..cafdf4837 100644
--- a/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Controllers/SelectedShippingPointController.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Shipping.ShippingPoint.Models;
diff --git a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
index ad3154678..e6f3a7214 100644
--- a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
+++ b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
@@ -1,72 +1,45 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\ref" />
- </Target>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\ref" />
+ </Target>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs b/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs
index 32f7a4471..ad555fc28 100644
--- a/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs
+++ b/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Shipping.ShippingPoint
diff --git a/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs b/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
index 3d07e07a3..b225c186d 100644
--- a/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
+++ b/src/Plugins/Shipping.ShippingPoint/ShippingPointRateProvider.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
diff --git a/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs b/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs
index d36b826dc..a91e4a5f0 100644
--- a/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs
+++ b/src/Plugins/Shipping.ShippingPoint/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs b/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs
index 1c855606b..d5de54422 100644
--- a/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs
+++ b/src/Plugins/Shipping.ShippingPoint/Validators/ShippingPointValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
using Shipping.ShippingPoint.Models;
diff --git a/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs b/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
index f4055f04c..ed90472b1 100644
--- a/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
+++ b/src/Plugins/Tax.CountryStateZip/Areas/Admin/Controllers/TaxCountryStateZipController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs
index 0a0e90d7d..13ebc87ab 100644
--- a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs
+++ b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxPlugin.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Tax.CountryStateZip
diff --git a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs
index 95f45f044..6387edcee 100644
--- a/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs
+++ b/src/Plugins/Tax.CountryStateZip/CountryStateZipTaxProvider.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Tax.CountryStateZip.Infrastructure.Cache;
diff --git a/src/Plugins/Tax.CountryStateZip/StartupApplication.cs b/src/Plugins/Tax.CountryStateZip/StartupApplication.cs
index 45c4cc6ab..f67fcb22b 100644
--- a/src/Plugins/Tax.CountryStateZip/StartupApplication.cs
+++ b/src/Plugins/Tax.CountryStateZip/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
index ead61baec..ca5793291 100644
--- a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
+++ b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\ref" />
- </Target>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\ref" />
+ </Target>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
index 4a79ea36f..df7e3e044 100644
--- a/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
+++ b/src/Plugins/Tax.FixedRate/Areas/Admin/Controllers/TaxFixedRateController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs b/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs
index 2e4e54cb7..676b6578b 100644
--- a/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs
+++ b/src/Plugins/Tax.FixedRate/FixedRateTaxPlugin.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Tax.FixedRate
diff --git a/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs b/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
index b651b0382..3a32ed74c 100644
--- a/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
+++ b/src/Plugins/Tax.FixedRate/FixedRateTaxProvider.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Tax.FixedRate.Models;
namespace Tax.FixedRate
diff --git a/src/Plugins/Tax.FixedRate/StartupApplication.cs b/src/Plugins/Tax.FixedRate/StartupApplication.cs
index b11081af0..962800ba9 100644
--- a/src/Plugins/Tax.FixedRate/StartupApplication.cs
+++ b/src/Plugins/Tax.FixedRate/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
index cb547c455..44b6daa03 100644
--- a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
+++ b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.FixedRate\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.FixedRate\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.FixedRate\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.FixedRate\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.FixedRate\ref" />
- </Target>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Tax.FixedRate\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.FixedRate\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.FixedRate\ref" />
+ </Target>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
index 0dda0f4bb..7a9022dcc 100644
--- a/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
+++ b/src/Plugins/Widgets.FacebookPixel/Areas/Admin/Controllers/WidgetsFacebookPixelController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs b/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs
index 1b9a15d64..a7bebddc0 100644
--- a/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs
+++ b/src/Plugins/Widgets.FacebookPixel/Components/WidgetsFacebookPixelViewComponent.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
diff --git a/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs b/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs
index 13719b5df..469a983bb 100644
--- a/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs
+++ b/src/Plugins/Widgets.FacebookPixel/FacebookPixelConsentCookie.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
namespace Widgets.FacebookPixel
{
diff --git a/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs b/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs
index 1486f1274..0731e3d0e 100644
--- a/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs
+++ b/src/Plugins/Widgets.FacebookPixel/FacebookPixelPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Widgets.FacebookPixel
diff --git a/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs b/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs
index 9e4b3f780..2e63ec281 100644
--- a/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs
+++ b/src/Plugins/Widgets.FacebookPixel/FacebookPixelProvider.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Localization;
namespace Widgets.FacebookPixel
{
diff --git a/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs b/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs
index 067f29487..2c753d6ba 100644
--- a/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs
+++ b/src/Plugins/Widgets.FacebookPixel/StartupApplication.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj
index 82399d347..e16e93950 100644
--- a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj
+++ b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
-
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel\ref" />
- </Target>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.FacebookPixel\ref" />
+ </Target>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
+
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
-
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
-
</Project>
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
index 40c8fd26a..e3f8b6de7 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Areas/Admin/Controllers/WidgetsGoogleAnalyticsController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
index d9a50df6c..d74729fbc 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/Components/WidgetsGoogleAnalyticsViewComponent.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Logging;
using Grand.Domain.Orders;
using Grand.Infrastructure;
diff --git a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs
index 27bba2b95..075bd6c18 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Plugins;
namespace Widgets.GoogleAnalytics
diff --git a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs
index f363d08df..12e2faa38 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticProvider.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Localization;
namespace Widgets.GoogleAnalytics
{
diff --git a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs
index 8c08711fa..05417bcc7 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/GoogleAnalyticsConsentCookie.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
namespace Widgets.GoogleAnalytics
{
diff --git a/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs b/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs
index 86755ce91..4310fdb0d 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs
+++ b/src/Plugins/Widgets.GoogleAnalytics/StartupApplication.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj
index a93dec8de..1265ca7f3 100644
--- a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj
+++ b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj
@@ -1,73 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics\ref" />
- </Target>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.GoogleAnalytics\ref" />
+ </Target>
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
- <ItemGroup>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
index b73f08550..a531b1b92 100644
--- a/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
index ca6620088..aff8aecf6 100644
--- a/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
+++ b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Plugins/Widgets.Slider/Services/SliderService.cs b/src/Plugins/Widgets.Slider/Services/SliderService.cs
index 11d15257d..912a0abe7 100644
--- a/src/Plugins/Widgets.Slider/Services/SliderService.cs
+++ b/src/Plugins/Widgets.Slider/Services/SliderService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Data;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
index 48b7d3a77..99db25a39 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Data;
using Grand.Infrastructure.Plugins;
using Grand.SharedKernel.Extensions;
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
index 7ef43f289..9d66345c9 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Localization;
namespace Widgets.Slider
{
diff --git a/src/Plugins/Widgets.Slider/StartupApplication.cs b/src/Plugins/Widgets.Slider/StartupApplication.cs
index 616f660dc..131d27767 100644
--- a/src/Plugins/Widgets.Slider/StartupApplication.cs
+++ b/src/Plugins/Widgets.Slider/StartupApplication.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
diff --git a/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs b/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs
index 0d40b3580..17254588c 100644
--- a/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs
+++ b/src/Plugins/Widgets.Slider/Validators/SlideValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
using Widgets.Slider.Domain;
using Widgets.Slider.Models;
diff --git a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
index 06185ed5a..68a05951c 100644
--- a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
+++ b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
@@ -1,74 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
-<Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
- </PropertyGroup>
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.Slider\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.Slider\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.Slider\</OutputPath>
- <OutDir>$(OutputPath)</OutDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Plugins\Widgets.Slider\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
- <Target Name="PostBuild" AfterTargets="PostBuildEvent">
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.Slider\refs" />
- <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.Slider\ref" />
- </Target>
-
- <ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
- <Private>false</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
- <Private>false</Private>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Update="Assets\**\*.*">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="logo.jpg">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.Slider\refs" />
+ <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Widgets.Slider\ref" />
+ </Target>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj">
+ <Private>false</Private>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Update="Assets\**\*.*">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="logo.jpg">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs
index be3140bac..8628b9242 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs
+++ b/src/Tests/Grand.Business.Authentication.Tests/ApiAuthenticationServiceTests.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Business.Authentication.Services;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.JwtBearer;
diff --git a/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs b/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs
index 03efbde92..ec33248cf 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs
+++ b/src/Tests/Grand.Business.Authentication.Tests/CookieAuthenticationServiceTests.cs
@@ -1,7 +1,7 @@
using Grand.Business.Authentication.Services;
-using Grand.Business.Authentication.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Authentication;
using Grand.Domain.Customers;
using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Authentication;
diff --git a/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj b/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj
index cd16577bf..7cd0acf17 100644
--- a/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj
+++ b/src/Tests/Grand.Business.Authentication.Tests/Grand.Business.Authentication.Tests.csproj
@@ -17,6 +17,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductAttributeExtensionsTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductAttributeExtensionsTests.cs
index 7d8638f2f..fa0dd58de 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductAttributeExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductAttributeExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductExtensionsTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductExtensionsTests.cs
index 7f4d5015c..87fc2d7ad 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Extensions/ProductExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs
index ebe9a0d7a..463be5962 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Extensions/TierPriceExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj b/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj
index 4e417bff8..e9873ede2 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj
+++ b/src/Tests/Grand.Business.Catalog.Tests/Grand.Business.Catalog.Tests.csproj
@@ -17,6 +17,8 @@
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs
index 7b6a9271d..4ade439f6 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateIntervalPropertiesCommandHandlerTests.cs
@@ -1,5 +1,5 @@
using Grand.Business.Catalog.Commands.Handlers;
-using Grand.Business.Catalog.Commands.Models;
+using Grand.Business.Core.Commands.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Data.Mongo;
using Grand.Infrastructure.Caching;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs
index dcb72e079..3d8f2eb3a 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Handlers/UpdateProductReviewTotalsCommandHandlerTest.cs
@@ -1,5 +1,5 @@
//using Grand.Business.Catalog.Commands.Handlers;
-//using Grand.Business.Catalog.Interfaces.Products;
+//using Grand.Business.Core.Interfaces.Catalog.Products;
//using Grand.Domain;
//using Grand.Domain.Catalog;
//using Grand.Domain.Data.Mongo;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs
index aac53fd5b..ef5eea163 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Category/CategoryServiceTests.cs
@@ -1,5 +1,5 @@
using Grand.Business.Catalog.Services.Categories;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs
index 5086daf38..709f02d44 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Collections/CollectionServiceTests.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Business.Catalog.Services.Collections;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
using Grand.Infrastructure;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs
index 5969ee111..0c3ef1801 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceFormatterTests.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
using Grand.Business.Catalog.Services.Prices;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Common.Services.Directory;
using Grand.Domain.Data;
using Grand.Domain.Data.Mongo;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs
index 378104b7f..72b552dbd 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Prices/PriceServiceTests.cs
@@ -1,14 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Catalog.Services.Prices;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Directory;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Data;
@@ -23,6 +22,7 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
+using Grand.Business.Common.Services.Directory;
namespace Grand.Business.Catalog.Tests.Service.Prices
{
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs
index db73cf362..812eff786 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/CopyProductServiceTests.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Catalog.Services.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Seo;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/StockQuantityServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/StockQuantityServiceTests.cs
index 446506a08..ee69e7d27 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Products/StockQuantityServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Products/StockQuantityServiceTests.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Catalog.Services.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs
index 3d7ee17c4..b2b172d4d 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/FixedRateTestTaxProvider.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Infrastructure.Plugins;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
index a797f4963..85815cb60 100644
--- a/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
+++ b/src/Tests/Grand.Business.Catalog.Tests/Service/Tax/TaxServiceTests.cs
@@ -1,16 +1,16 @@
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Business.Catalog.Services.Tax;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Tax;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using Grand.Domain.Catalog;
using Grand.SharedKernel.Extensions;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Business.Catalog.Tests.Service.Tax
{
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs
index b54b49663..56293156b 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/ActivatedValueForPurchasedGiftVouchersCommandHandlerTests.cs
@@ -1,8 +1,8 @@
using Grand.Business.Checkout.Commands.Handlers.Orders;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs
index 242be43a2..f51fa64ff 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CalculateLoyaltyPointsCommandHandlerTests.cs
@@ -1,5 +1,5 @@
using Grand.Business.Checkout.Commands.Handlers.Orders;
-using Grand.Business.Checkout.Commands.Models.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs
index e05c8466a..d08eb8122 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CancelOrderCommandHandlerTests.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Business.Checkout.Commands.Handlers.Orders;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Events.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Events.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using MediatR;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs
index fe3e718be..8a1ab2e7c 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Commands/Orders/CheckOrderStatusCommandHandlerTests.cs
@@ -1,6 +1,6 @@
using Grand.Business.Checkout.Commands.Handlers.Orders;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using MediatR;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs
index 71b584612..93567dd86 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/CheckoutAttributeExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs
index e407cc887..0c06f2ce3 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/OrderExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs
index 096a38129..657616597 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/PaymentExtensionsTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Domain.Payments;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs
index 452f1f30a..e420c5e8c 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShippingExtensionsTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Domain.Shipping;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs
index e8ec3b1f6..6256b0ba6 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Extensions/ShoppingCartExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj b/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj
index e4cb61bc1..2ec8aa2c0 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj
+++ b/src/Tests/Grand.Business.Checkout.Tests/Grand.Business.Checkout.Tests.csproj
@@ -17,6 +17,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
index 4644785a6..e9e12cd80 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Business.Checkout.Services.CheckoutAttributes;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
index 0bd65d0c2..670326f59 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Business.Checkout.Services.CheckoutAttributes;
using Grand.Domain.Data;
using Grand.Domain.Orders;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
index 52f32f716..0cc4af904 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/GiftVouchers/GiftVoucherServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
using Grand.Business.Checkout.Services.GiftVouchers;
using Grand.Domain.Data;
using Grand.Domain.Orders;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
index 213ad8e53..1d226e149 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Payments/PaymentServiceTests.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Business.Checkout.Services.Payments;
-using Grand.Business.Common.Interfaces.Configuration;
+using Grand.Business.Core.Interfaces.Common.Configuration;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.SharedKernel;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
index aa076dfe7..ece9ba608 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/DeliveryDateServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Checkout.Services.Shipping;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
index b37c40e3c..d2660eb56 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/PickupPointServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Checkout.Services.Shipping;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
index 82974bcc5..6ed62e6b7 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingMethodServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Checkout.Services.Shipping;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs
index 9a995aece..1042e1e9d 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/ShippingServiceTests.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Checkout.Services.Shipping;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
index 5ef9c0275..13069caec 100644
--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Shipping/WarehouseServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Business.Checkout.Services.Shipping;
using Grand.Domain.Data;
using Grand.Domain.Shipping;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs b/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs
index 5e54d34d9..c435ffcff 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Events/BlogPostDeletedEventHandlerTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces.Events;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Cms.Events;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Domain.Blogs;
using Grand.Domain.Seo;
using Grand.Infrastructure.Events;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs b/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs
index c8dbaa710..82dfb55d9 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Extensions/BlogExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Blogs;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj b/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj
index e38df7b39..75ced35cc 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj
+++ b/src/Tests/Grand.Business.Cms.Tests/Grand.Business.Cms.Tests.csproj
@@ -17,6 +17,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/CookiePreferenceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/CookiePreferenceTests.cs
index c25abd5ce..1a9cc5372 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/CookiePreferenceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/CookiePreferenceTests.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Business.Cms.Services;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
diff --git a/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs b/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs
index 4ee402361..b2b16761d 100644
--- a/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs
+++ b/src/Tests/Grand.Business.Cms.Tests/Services/WidgetServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Business.Cms.Services;
using Grand.Domain.Cms;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Common.Tests/Extensions/AddressAttributeExtensionsTests.cs b/src/Tests/Grand.Business.Common.Tests/Extensions/AddressAttributeExtensionsTests.cs
index 3f26fc704..226ef57b3 100644
--- a/src/Tests/Grand.Business.Common.Tests/Extensions/AddressAttributeExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Extensions/AddressAttributeExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Common.Tests/Extensions/SeoExtensionsTests.cs b/src/Tests/Grand.Business.Common.Tests/Extensions/SeoExtensionsTests.cs
index 58194777f..e3dbcb5c2 100644
--- a/src/Tests/Grand.Business.Common.Tests/Extensions/SeoExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Extensions/SeoExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs b/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs
index 9eb952343..bb24610be 100644
--- a/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Extensions/TranslateExtensionsTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Permissions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj b/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj
index 4bb0f396d..ea1523f3c 100644
--- a/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj
+++ b/src/Tests/Grand.Business.Common.Tests/Grand.Business.Common.Tests.csproj
@@ -27,6 +27,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs
index 7d9fc1a6b..6a43fe3ee 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeParserTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Common.Services.Addresses;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
index 5482fc2aa..739ada864 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Common.Services.Directory;
using Grand.Domain.Data;
using Grand.Domain.Data.Mongo;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs
index 9cf24aebe..ba2a8c79e 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/ExchangeRateServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Providers;
+using Grand.Business.Core.Interfaces.Common.Providers;
using Grand.Business.Common.Services.Directory;
using Grand.Domain.Directory;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs
index 40b54cc70..619a882de 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/HistoryServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Common.Services.Directory;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs
index af17a93bc..b972faad4 100644
--- a/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs
+++ b/src/Tests/Grand.Business.Common.Tests/Services/Security/PermissionServiceTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Customers;
using Grand.Domain.Data;
using Grand.Domain.Permissions;
@@ -28,8 +28,8 @@ namespace Grand.Business.Common.Tests.Services.Security
_workContextMock = new Mock<IWorkContext>();
_groupServiceMock = new Mock<IGroupService>();
_cacheMock = new Mock<ICacheBase>();
- _service = new PermissionService(_permissionRepositoryMock.Object,_permissionActionRepositoryMock.Object,_workContextMock.Object,
- _groupServiceMock.Object,_cacheMock.Object);
+ _service = new PermissionService(_permissionRepositoryMock.Object, _permissionActionRepositoryMock.Object, _workContextMock.Object,
+ _groupServiceMock.Object, _cacheMock.Object);
}
[TestMethod]
@@ -40,7 +40,7 @@ namespace Grand.Business.Common.Tests.Services.Security
fakeCustomer.Groups.Add("group1");
_workContextMock.Setup(c => c.CurrentCustomer).Returns(fakeCustomer);
_cacheMock.Setup(c => c.GetAsync<bool>(It.IsAny<string>(), It.IsAny<Func<Task<bool>>>())).Returns(Task.FromResult(true));
- _groupServiceMock.Setup(c => c.GetAllByIds(It.IsAny<string[]>())).Returns(Task.FromResult<IList<CustomerGroup>>(new List<CustomerGroup>() {new CustomerGroup() }));
+ _groupServiceMock.Setup(c => c.GetAllByIds(It.IsAny<string[]>())).Returns(Task.FromResult<IList<CustomerGroup>>(new List<CustomerGroup>() { new CustomerGroup() }));
Assert.IsTrue(await _service.Authorize(permission));
}
@@ -60,7 +60,7 @@ namespace Grand.Business.Common.Tests.Services.Security
public async Task InsertPermission_InovokeMethods()
{
await _service.InsertPermission(new Permission());
- _permissionRepositoryMock.Verify(c => c.InsertAsync(It.IsAny<Permission>()),Times.Once);
+ _permissionRepositoryMock.Verify(c => c.InsertAsync(It.IsAny<Permission>()), Times.Once);
_cacheMock.Verify(c => c.RemoveByPrefix(It.IsAny<string>(), It.IsAny<bool>()), Times.Once);
}
diff --git a/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs b/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs
index e8e5f852c..a8f968b54 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Extensions/AffiliateExtensionsTests.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Affiliates;
using Grand.Infrastructure;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
+using Grand.Business.Core.Extensions;
namespace Grand.Business.Customers.Tests.Extensions
{
diff --git a/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj b/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj
index dc5cddf26..aa36bd49b 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj
+++ b/src/Tests/Grand.Business.Customers.Tests/Grand.Business.Customers.Tests.csproj
@@ -17,6 +17,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj" />
</ItemGroup>
diff --git a/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs b/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
index aca02f006..e90c56ca2 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Handler/ActiveVendorCommandHandlerTests.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.Customers.Commands.Handlers;
-using Grand.Business.Customers.Commands.Models;
-using Grand.Business.Customers.Events;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Commands.Customers;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Customers;
using MediatR;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
index e9d731a4b..e0bbb25f0 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/AffiliateServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Customers.Services;
using Grand.Domain.Affiliates;
using Grand.Domain.Data;
diff --git a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs
index b96989a63..a01d3819e 100644
--- a/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs
+++ b/src/Tests/Grand.Business.Customers.Tests/Services/CustomerAttributeParserTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Customers.Services;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Extensions/ContactAttributeExtensionsTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Extensions/ContactAttributeExtensionsTests.cs
index 94044e0a3..2921620ca 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Extensions/ContactAttributeExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Extensions/ContactAttributeExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Messages;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs
index 13c36fb48..832a71067 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Extensions/KnowledgebaseExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Knowledgebase;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj b/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj
index b2f136d31..7a54fcfd0 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj
+++ b/src/Tests/Grand.Business.Marketing.Tests/Grand.Business.Marketing.Tests.csproj
@@ -22,6 +22,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj" />
</ItemGroup>
diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
index 7da62b769..0f0357288 100644
--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Newsletters/NewsLetterSubscriptionServiceTests.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Marketing.Events;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Events.Marketing;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Business.Marketing.Services.Newsteletters;
using Grand.Domain;
using Grand.Domain.Data;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs b/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs
index 2bcdfc099..9b8b3a142 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Commands/InsertContactUsCommandHandlerTests.cs
@@ -1,5 +1,5 @@
using Grand.Business.Messages.Commands.Handlers;
-using Grand.Business.Messages.Commands.Models;
+using Grand.Business.Core.Commands.Messages;
using Grand.Domain.Common;
using Grand.Domain.Data;
using Grand.Domain.Messages;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj b/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj
index 5b5a73cb1..52e6bb5fa 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj
+++ b/src/Tests/Grand.Business.Messages.Tests/Grand.Business.Messages.Tests.csproj
@@ -16,6 +16,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj" />
</ItemGroup>
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
index ed4385557..2c876e773 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/LiquidObjectBuilderTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.DotLiquidDrops;
+using Grand.Business.Core.Utilities.Messages.DotLiquidDrops;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Stores;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
index 2eb36ca89..6332a621c 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageProviderServiceTest.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Messages.Queries.Models;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Queries.Messages;
using Grand.Business.Messages.Services;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
index 20be70176..67e12ac3e 100644
--- a/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
+++ b/src/Tests/Grand.Business.Messages.Tests/Services/MessageTemplateServiceTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Business.Messages.Services;
using Grand.Domain.Catalog;
using Grand.Domain.Data;
diff --git a/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs b/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs
index 94f1200f4..3ac50c904 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Extensions/ExtensionsTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Extensions;
+using Grand.Business.Core.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj b/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj
index 2233280bc..12b4ec503 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj
+++ b/src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj
@@ -16,6 +16,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj" />
</ItemGroup>
diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
index cb14a9ec4..ff585a7cd 100644
--- a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
+++ b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Business.Storage.Services;
using Grand.Domain.Data;
using Grand.Domain.Media;
diff --git a/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
index c94de89ba..01e554724 100644
--- a/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.System.Commands.Handlers.Catalog;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
index 9a0858a97..7606f8ae1 100644
--- a/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.System.Commands.Handlers.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
diff --git a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj b/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
index b100e64bc..b9a77364f 100644
--- a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
+++ b/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
@@ -16,6 +16,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />
</ItemGroup>
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
index 468b51fcb..596e06650 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs
index 30566506d..4099b77ea 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearLogScheduleTaskTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs
index a9edcf044..9baeedb75 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderAbandonedCartScheduleTaskTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs
index af9915a4e..682e95b2a 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CustomerReminderTasksTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
index 28fc9c8c3..06512c3ad 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Common;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
index 3a233763d..3c8812142 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
@@ -1,9 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain;
using Grand.Domain.Catalog;
@@ -13,6 +12,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Business.System.Tests.Services.BackgroundService
{
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
index 25bbdb526..c68d89087 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain;
using Grand.Domain.Customers;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
index 135bd4f88..2316d10f1 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Directory;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs b/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
index eb261537f..858a2082b 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Business.System.Services.ExportImport;
using Grand.Domain.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
index cfc23bc15..baf2f980e 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Business.System.Services.Migrations;
using Grand.Domain.Data;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj b/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj
index bc74df323..494bf5c05 100644
--- a/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj
+++ b/src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj
@@ -17,6 +17,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" />
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
</ItemGroup>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml
index d2c8c9e77..80018def3 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Brand/_CreateOrUpdate.cshtml
@@ -1,8 +1,8 @@
@model BrandModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml
index d58473b3f..1eab6afbe 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Category/_CreateOrUpdate.cshtml
@@ -1,8 +1,8 @@
@model CategoryModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml
index 45f91ca78..6229550a8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Collection/_CreateOrUpdate.cshtml
@@ -1,8 +1,8 @@
@model CollectionModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml
index 9f2beafd9..e33c5c549 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.TabActivityLog.cshtml
@@ -1,6 +1,6 @@
@model CustomerModel
@inject AdminAreaSettings adminAreaSettings
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permisionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permisionService
@{
var defaultGridPageSize = adminAreaSettings.DefaultGridPageSize;
var gridPageSizes = adminAreaSettings.GridPageSizes;
@@ -157,7 +157,7 @@
</script>
}
- @if (await permisionService.Authorize(Grand.Business.Common.Services.Security.PermissionSystemName.MessageQueue))
+ @if (await permisionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.MessageQueue))
{
<br />
<strong>@Loc["Admin.System.QueuedEmails"]</strong>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.cshtml
index 4b0109007..6b6c31ef2 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/_CreateOrUpdate.cshtml
@@ -1,8 +1,8 @@
@model CustomerModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml
index 619918d06..c3c3beb25 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/CustomerGroup/_CreateOrUpdate.cshtml
@@ -1,7 +1,7 @@
@model CustomerGroupModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
- var access = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageAcl);
+ var access = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageAcl);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml
index b0e629806..c5e86d26e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Document/List.cshtml
@@ -1,6 +1,6 @@
@model DocumentListModel
@inject AdminAreaSettings adminAreaSettings
-@inject Grand.Business.Common.Interfaces.Localization.ITranslationService translationService
+@inject Grand.Business.Core.Interfaces.Common.Localization.ITranslationService translationService
@{
//page title
ViewBag.Title = Loc["Admin.Documents.Document.Manage"];
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/_CreateOrUpdate.cshtml
index 34e7152a3..77471f2df 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/EmailAccount/_CreateOrUpdate.cshtml
@@ -64,7 +64,7 @@
<div class="form-group">
<admin-label asp-for="SecureSocketOptionsId" />
<div class="col-md-9 col-sm-9">
- <admin-select asp-for="SecureSocketOptionsId" asp-items="((MailKit.Security.SecureSocketOptions)Model.SecureSocketOptionsId).ToSelectList(Context)" />
+ <admin-select asp-for="SecureSocketOptionsId" asp-items="((Grand.Business.Core.Enums.Messages.SecureSocketOptions)Model.SecureSocketOptionsId).ToSelectList(Context)" />
</div>
</div>
@if (!String.IsNullOrEmpty(Model.Id))
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml
index 2e7254a43..d8b4f359e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml
@@ -1,18 +1,18 @@
@model DashboardModel
@inject Grand.Domain.Customers.CustomerSettings customerSettings
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
-@inject Grand.Business.Customers.Interfaces.ICustomerService customerService
-@inject Grand.Business.System.Interfaces.Reports.IOrderReportService orderReportService
-@inject Grand.Business.Catalog.Interfaces.Prices.IPriceFormatter priceFormatter
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Customers.ICustomerService customerService
+@inject Grand.Business.Core.Interfaces.System.Reports.IOrderReportService orderReportService
+@inject Grand.Business.Core.Interfaces.Catalog.Prices.IPriceFormatter priceFormatter
@inject Grand.Infrastructure.IWorkContext workContext
-@inject Grand.Business.Common.Interfaces.Directory.IGroupService groupService
+@inject Grand.Business.Core.Interfaces.Common.Directory.IGroupService groupService
@{
//page title
ViewBag.Title = Loc["Admin.Dashboard"];
var isAdminAccess = await groupService.IsAdmin(workContext.CurrentCustomer);
- var canAccessReports = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageReports);
- var canManageOrders = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageOrders);
+ var canAccessReports = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageReports);
+ var canManageOrders = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageOrders);
var customersOnline = (await customerService.GetOnlineCustomers(DateTime.UtcNow.AddMinutes(-customerSettings.OnlineCustomerMinutes), null, workContext.CurrentCustomer.StaffStoreId, workContext.CurrentCustomer.SeId, 1, 1)).TotalCount;
var customersShoppingCart = await customerService.GetCountOnlineShoppingCart(DateTime.UtcNow.AddMinutes(-customerSettings.OnlineShoppingCartMinutes), workContext.CurrentCustomer.StaffStoreId, workContext.CurrentCustomer.SeId);
var ordersToday = await orderReportService.GetOrderPeriodReport(0, workContext.CurrentCustomer.StaffStoreId, workContext.CurrentCustomer.SeId);
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Statistics.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Statistics.cshtml
index a52cd5c65..ee4316fb7 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Statistics.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Statistics.cshtml
@@ -1,12 +1,12 @@
@model DashboardModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//page title
ViewBag.Title = Loc["Admin.Dashboard.Statistics"];
- var canManageOrders = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageOrders);
- var canManageCustomers = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageCustomers);
- var canManageProducts = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageProducts);
+ var canManageOrders = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageOrders);
+ var canManageCustomers = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageCustomers);
+ var canManageProducts = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageProducts);
}
<div class="page-bar" style="height:43px;">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml
index 4ae0712b8..4f3474baf 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MerchandiseReturn/_CreateOrUpdate.cshtml
@@ -1,10 +1,10 @@
@model MerchandiseReturnModel
@inject AdminAreaSettings adminAreaSettings
@inject OrderSettings orderSettings
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
index f6ac80b70..ffa14582d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Edit.cshtml
@@ -1,11 +1,11 @@
@model OrderModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//page title
ViewBag.Title = Loc["Admin.Orders.EditOrderDetails"];
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
- var canManageMessageQueue = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageMessageQueue);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
+ var canManageMessageQueue = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageMessageQueue);
}
<form asp-area="@Constants.AreaAdmin" asp-controller="Order" asp-action="Edit" method="post" id="order-form">
<input type="hidden" asp-for="Id" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Addresses.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Addresses.cshtml
index 26ba59dbd..b07809fc1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Addresses.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Addresses.cshtml
@@ -1,5 +1,5 @@
@model OrderModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permisionService;
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permisionService;
<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model" />
<div class="card col-md-6">
<div class="card-body">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml
index eb2ef2f53..d0133aaf8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Info.cshtml
@@ -2,7 +2,7 @@
@inject IOrderTagService orderTagService
@using Grand.Domain.Tax;
@using Grand.Domain.Orders;
-@using Grand.Business.Checkout.Interfaces.Orders;
+@using Grand.Business.Core.Interfaces.Checkout.Orders;
@using System.Text;
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Shipment.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Shipment.cshtml
index 137bcaae7..1e86f4781 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Shipment.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/_OrderDetails.Shipment.cshtml
@@ -1,9 +1,9 @@
@model OrderModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permisionService;
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permisionService;
<vc:admin-widget widget-zone="order_details_address_top" additional-data="Model" />
@if (Model.IsShippable)
{
- @if (await permisionService.Authorize(Grand.Business.Common.Services.Security.PermissionSystemName.Shipments))
+ @if (await permisionService.Authorize(Grand.Business.Core.Utilities.Common.Security.PermissionSystemName.Shipments))
{
<div class="card col-md-12">
<div class="card-body">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
index 60a68b142..a27cc9903 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/AttributeCombinationPopup.cshtml
@@ -1,6 +1,6 @@
@model ProductAttributeCombinationModel
-@inject Grand.Business.Common.Interfaces.Stores.IStoreService _storeService
-@inject Grand.Business.Common.Interfaces.Directory.IGroupService _groupService
+@inject Grand.Business.Core.Interfaces.Common.Stores.IStoreService _storeService
+@inject Grand.Business.Core.Interfaces.Common.Directory.IGroupService _groupService
@{
Layout = "";
if (string.IsNullOrEmpty(Model.Id))
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Info.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Info.cshtml
index 9c39d011b..1129fc493 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Info.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.Info.cshtml
@@ -1,6 +1,6 @@
@model ProductModel
@using Microsoft.AspNetCore.Mvc.Razor;
-@inject Grand.Business.Catalog.Interfaces.Products.IProductTagService productTagService
+@inject Grand.Business.Core.Interfaces.Catalog.Products.IProductTagService productTagService
@inject IPageHeadBuilder pagebuilder
@{
//resources for product tags input
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductPrices.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductPrices.cshtml
index 32dbd2df3..670801988 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductPrices.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.ProductPrices.cshtml
@@ -1,5 +1,5 @@
@model ProductModel
-@inject Grand.Business.Common.Interfaces.Directory.ICurrencyService currencyService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICurrencyService currencyService
@{
var currencies = await currencyService.GetAllCurrencies();
var defaultCurrency = await currencyService.GetPrimaryStoreCurrency();
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml
index 36a9826d0..abbf7a5ac 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/_CreateOrUpdate.cshtml
@@ -1,8 +1,8 @@
@model ProductModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
index b4fc52b3e..8ce088f60 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
@@ -1,6 +1,6 @@
@model GeneralCommonSettingsModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
-@using Grand.Business.Common.Services.Security;
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
+@using Grand.Business.Core.Utilities.Common.Security;
@{
var canUpload = await permissionService.Authorize(StandardPermission.ManagePlugins);
}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml
index d6cadda7a..ddb65d338 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.cshtml
@@ -1,6 +1,6 @@
@model GeneralCommonSettingsModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
-@using Grand.Business.Common.Services.Security;
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
+@using Grand.Business.Core.Utilities.Common.Security;
@{
var canUpload = await permissionService.Authorize(StandardPermission.ManagePlugins);
//page title
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml
index 8b24451a2..a48c07b96 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/SystemSetting.cshtml
@@ -1,4 +1,4 @@
-@inject Grand.Business.Common.Interfaces.Localization.ILanguageService languageService
+@inject Grand.Business.Core.Interfaces.Common.Localization.ILanguageService languageService
@model Grand.Web.Admin.Models.Settings.SystemSettingsModel
@{
//page title
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml
index 2e0c392d2..4ed61c868 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml
@@ -1,7 +1,7 @@
@model string
@using Grand.SharedKernel.Extensions
@using Grand.Web.Common.Page
-@inject Grand.Business.Storage.Interfaces.IDownloadService downloadService
+@inject Grand.Business.Core.Interfaces.Storage.IDownloadService downloadService
@inject IPageHeadBuilder pagebuilder
@{
<link rel="stylesheet" type="text/css" asp-src="/_content/Grand.Web.Admin/administration/fineuploader/fineuploader-4.2.2.min.css" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml
index c959f9844..b475d363a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml
@@ -1,7 +1,7 @@
@model String
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@using Grand.SharedKernel.Extensions
-@using Grand.Business.Common.Services.Security
+@using Grand.Business.Core.Utilities.Common.Security
@{
var allowFileman = await permissionService.Authorize(StandardPermission.HtmlEditorManagePictures);
var random = CommonHelper.GenerateRandomInteger();
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml
index 39fadaa1c..c5ec42c6c 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml
@@ -1,5 +1,5 @@
@model string
-@inject Grand.Business.Storage.Interfaces.IPictureService pictureService
+@inject Grand.Business.Core.Interfaces.Storage.IPictureService pictureService
@{
var random = CommonHelper.GenerateRandomInteger();
var clientId = "picture" + random;
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Menu.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Menu.cshtml
index 502cd98e4..a8740da19 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Menu.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Menu.cshtml
@@ -1,7 +1,7 @@
-@using Grand.Business.Common.Interfaces.Security
-@using Grand.Business.Common.Interfaces.Localization
+@using Grand.Business.Core.Interfaces.Common.Security
+@using Grand.Business.Core.Interfaces.Common.Localization
@using Grand.Web.Common.Menu
-@using Grand.Business.System.Interfaces.Admin
+@using Grand.Business.Core.Interfaces.System.Admin
@inject IPermissionService permissionService
@inject ITranslationService translationService
@inject IAdminSiteMapService adminSiteMapService
@@ -38,7 +38,7 @@
var pluginNode = rootNode.ChildNodes.FirstOrDefault(x => x.SystemName == "Third party plugins");
if (pluginNode != null && pluginNode.Visible)
{
- var hasManagePluginsPermission = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManagePlugins);
+ var hasManagePluginsPermission = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManagePlugins);
pluginNode.Visible = hasManagePluginsPermission && pluginNode.ChildNodes.Any(x => x.Visible);
}
}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml
index 3afd42d63..300291d01 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml
@@ -1,17 +1,17 @@
@inject IWorkContext workContext
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@inject CommonSettings commonSettings
@inject CustomerSettings customerSettings
@inject LanguageSettings languageSettings
@inject AdminAreaSettings adminAreaSettings
@inject Grand.Infrastructure.Configuration.AppConfig appConfig
-@inject Grand.Business.Common.Interfaces.Directory.IGroupService groupService
+@inject Grand.Business.Core.Interfaces.Common.Directory.IGroupService groupService
@using System.Text.Encodings.Web
@using Grand.Domain.Customers
@using Grand.Infrastructure;
@using Grand.Domain.Localization
-@using Grand.Business.Common.Services.Security;
+@using Grand.Business.Core.Utilities.Common.Security;
@using Grand.Domain.Common;
@{
var currentCustomer = workContext.CurrentCustomer;
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml
index e9e74d68a..5c53755db 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_UserFields.cshtml
@@ -1,5 +1,5 @@
@model Grand.Infrastructure.Models.BaseEntityModel
-@inject Grand.Business.Common.Interfaces.Stores.IStoreService storeService
+@inject Grand.Business.Core.Interfaces.Common.Stores.IStoreService storeService
@{
var userFields = Model.UserFields.ToList();
var stores = (await storeService.GetAllStores()).Select(store => new SelectListItem
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
index e6ac3cf67..7d8138b1e 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipment/ShipmentDetails.cshtml
@@ -1,9 +1,9 @@
@model ShipmentModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//page title
ViewBag.Title = Loc["Admin.Orders.Shipments.ViewDetails"];
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<form asp-area="@Constants.AreaAdmin" asp-controller="Shipment" asp-action="ShipmentDetails" method="post">
<input type="hidden" asp-for="Id" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml
index 1bc1f328c..b51dc4216 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Vendor/_CreateOrUpdate.cshtml
@@ -1,8 +1,8 @@
@model VendorModel
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
//has "Manage Documents" permission?
- var canManageDocuments = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.ManageDocuments);
+ var canManageDocuments = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.ManageDocuments);
}
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml
index 80efdcbb1..a96544070 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/_ViewImports.cshtml
@@ -14,7 +14,7 @@
@using Grand.Domain.Documents
@using Grand.Domain.Orders
@using Grand.Infrastructure.TypeConverters
-@using Grand.Business.Cms.Interfaces
+@using Grand.Business.Core.Interfaces.Cms
@using Grand.Web.Common
@using Grand.Web.Common.Events
@using Grand.Web.Common.Extensions
diff --git a/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs b/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs
index 748f92b98..b9eeb0962 100644
--- a/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs
+++ b/src/Web/Grand.Web.Admin/Components/AdminLanguageSelector.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure;
using Grand.Web.Common.Components;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Common;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/AdminWidget.cs b/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
index 0167fa55f..d5dd1f738 100644
--- a/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
+++ b/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Infrastructure;
using Grand.Web.Admin.Models.Cms;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web.Admin/Components/Affiliate.cs b/src/Web/Grand.Web.Admin/Components/Affiliate.cs
index dc281c8a5..c180ebbed 100644
--- a/src/Web/Grand.Web.Admin/Components/Affiliate.cs
+++ b/src/Web/Grand.Web.Admin/Components/Affiliate.cs
@@ -2,13 +2,13 @@
using Grand.Domain.Shipping;
using Grand.Web.Common.Components;
using Grand.Web.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Admin.Models.Affiliates;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
namespace Grand.Web.Admin.Components
{
diff --git a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs
index af5a4c412..4c39223f5 100644
--- a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs
+++ b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByAmount.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs
index 1ac57b23f..1180d0116 100644
--- a/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs
+++ b/src/Web/Grand.Web.Admin/Components/BestsellersBriefReportByQuantity.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs b/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs
index d17758982..f482d54d5 100644
--- a/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs
+++ b/src/Web/Grand.Web.Admin/Components/CustomerReportRegistered.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs b/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs
index 1854ed64a..882d54c93 100644
--- a/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs
+++ b/src/Web/Grand.Web.Admin/Components/CustomerReportTimeChart.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/LatestOrder.cs b/src/Web/Grand.Web.Admin/Components/LatestOrder.cs
index 1eb5c8720..91a1ecb83 100644
--- a/src/Web/Grand.Web.Admin/Components/LatestOrder.cs
+++ b/src/Web/Grand.Web.Admin/Components/LatestOrder.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs b/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs
index eb9970774..8b34880ef 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderAverageReport.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs b/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs
index 3294d91be..0705f91b4 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderIncompleteReport.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs b/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs
index 8b457c20c..fd25e74bb 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderPeriodReport.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs b/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs
index 2437356b9..6bb5dec7c 100644
--- a/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs
+++ b/src/Web/Grand.Web.Admin/Components/OrderTimeChart.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs b/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs
index eac29b729..c83995c6a 100644
--- a/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs
+++ b/src/Web/Grand.Web.Admin/Components/PopularSearchTermsReport.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Components;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Components/StoreScope.cs b/src/Web/Grand.Web.Admin/Components/StoreScope.cs
index 41d0c3736..65c4a7f1f 100644
--- a/src/Web/Grand.Web.Admin/Components/StoreScope.cs
+++ b/src/Web/Grand.Web.Admin/Components/StoreScope.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Infrastructure;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Common.Components;
using Grand.Web.Admin.Models.Settings;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Stores;
namespace Grand.Web.Admin.Components
diff --git a/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs b/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs
index 5be01421c..30b511fb3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ActivityLogController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
index b9935d838..0616d3c77 100644
--- a/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/AddressAttributeController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs b/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs
index 2244dd62c..49249645f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Queries.Models;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Queries.Customers;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Affiliates;
using Grand.Web.Common.DataSource;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs b/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs
index 0d6512e6d..9ad5d7cdd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ApiUserController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/BannerController.cs b/src/Web/Grand.Web.Admin/Controllers/BannerController.cs
index e5d30c95f..80bc040da 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BannerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BannerController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Banners;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Banners;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Messages;
using Grand.Web.Common.DataSource;
diff --git a/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs b/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
index 974793b5c..7093e9b5c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BaseAdminController.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Domain.Common;
@@ -8,7 +8,7 @@ using Grand.Web.Admin.Extensions;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Microsoft.Extensions.DependencyInjection;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
index 91b6bd0b1..bf04e24fd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Seo;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
index c13d4fcf0..c0b440fae 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs b/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs
index dc5e8c4d9..994a81227 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Campaigns;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Campaigns;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Messages;
using Grand.Infrastructure;
using Grand.SharedKernel;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs
index 6707f300f..14a519ef1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
index 87487a98b..d89e072da 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
index b7ca432bc..9ead66fb3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
index 5e7bce0c2..c25958b6a 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs
index 6ccee74b3..89f7b5661 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactFormController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
index 036bb99f5..67cb9993b 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Country;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
index 7fadbbe4a..36729449c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs
index fe8b183d5..6ec4f0ded 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Directory;
using Grand.Infrastructure.Caching;
using Grand.SharedKernel;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
index ff0ed891f..c9eb502ee 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs
index 1026016d9..c025f9ce3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionTypeController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Extensions;
using Microsoft.AspNetCore.Http;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
index 5910cbf86..3168fbf63 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerAttributeController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
index a8a6dd4af..8ddf433f4 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
@@ -1,15 +1,15 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
index fd90f4fe7..026bdcd45 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.SharedKernel;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
index a3c8d648d..46f3842fc 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
index e59b8b7a9..63935a4a5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
index c51d80a63..080893c42 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs b/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
index e61db73b0..623981617 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DocumentController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Documents;
+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.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs b/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
index d82b0f919..bfb191af7 100644
--- a/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Common.Security.Authorization;
using Grand.Domain.Media;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs b/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs
index ea303c1e9..3da8d522e 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ElFinderController.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Common.Security.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
index c7f30097c..21a08d201 100644
--- a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Messages;
using Grand.Infrastructure.Caching;
using Grand.SharedKernel;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs b/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs
index 5920d727f..ef4db5b7f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ExternalAuthenticationController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Authentication.Extensions;
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs b/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs
index c3a2b6535..85a181f14 100644
--- a/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.SharedKernel.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
diff --git a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
index 389593392..5fcb3c644 100644
--- a/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/HomeController.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Queries.Models;
-using Grand.Business.System.Interfaces.Reports;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Queries.Customers;
+using Grand.Business.Core.Interfaces.System.Reports;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
index f87376813..8b0bc5aa0 100644
--- a/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/InteractiveFormController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+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.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
index eb085beaa..64e6fe9fb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Knowledgebase;
diff --git a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
index 0285fd352..07a295cbb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LanguageController.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Filters;
diff --git a/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs b/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs
index 854b47cbb..278936e13 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LayoutController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
@@ -11,7 +11,7 @@ using Grand.Domain.Pages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Layouts;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs b/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs
index 0a825278c..480453761 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Logging;
using Grand.Web.Common.DataSource;
diff --git a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
index adc3b8e19..a99123a69 100644
--- a/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/LoginController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Events;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Captcha;
diff --git a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
index 316fc545e..0845c1c1f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Commands.Models.Common;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Commands.System.Common;
using Grand.Domain.Media;
using Grand.Domain.Seo;
using Grand.Web.Admin.Extensions;
@@ -18,7 +18,6 @@ using Grand.Web.Common.Security.Authorization;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using SkiaSharp;
namespace Grand.Web.Admin.Controllers
{
@@ -153,9 +152,8 @@ namespace Grand.Web.Admin.Controllers
{
try
{
- using var image = SKBitmap.Decode(picture.PictureBinary);
- SKData d = SKImage.FromBitmap(image).Encode(SKEncodedImageFormat.Webp, mediaSettings.ImageQuality);
- await pictureService.UpdatePicture(picture.Id, d.ToArray(), "image/webp", picture.SeoFilename, picture.AltAttribute, picture.TitleAttribute,
+ var pictureConverted = pictureService.ConvertPicture(picture.PictureBinary, mediaSettings.ImageQuality);
+ await pictureService.UpdatePicture(picture.Id, pictureConverted, "image/webp", picture.SeoFilename, picture.AltAttribute, picture.TitleAttribute,
picture.Style, picture.ExtraField, true, false);
numberOfConvertItems += 1;
}
diff --git a/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs b/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs
index bcb2a95da..61b70beca 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MeasureController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
@@ -9,7 +9,7 @@ using Grand.Infrastructure.Caching;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Directory;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs
index 874c28629..97d146781 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Common;
using Grand.Domain.Orders;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs b/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs
index 89a4f66cc..34048caea 100644
--- a/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Messages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Messages;
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
index 68c7c8382..59fff4178 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs
index 138b27f5f..fa85815fb 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Messages;
using Grand.Web.Common.DataSource;
diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs
index 24675a9dd..f0dd21fc5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs
index 90845baa4..7930b14f5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OnlineCustomerController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -9,7 +9,7 @@ using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
index 42391ffdf..6a083e5cd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderController.cs
@@ -1,14 +1,14 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Pdf;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs
index e9eec59f0..8933aa3e3 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderStatusController.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Orders;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Orders;
diff --git a/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs b/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs
index dcf6a7985..c4dbbdd4d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/OrderTagsController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PageController.cs b/src/Web/Grand.Web.Admin/Controllers/PageController.cs
index 49cfc75d1..e44bcc705 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PageController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PageController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
index 4ac307286..e1f1b75d5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Payments;
using Grand.Infrastructure;
using Grand.Infrastructure.Plugins;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
index a7fe4bda9..443f0e24f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Payments;
using Grand.Infrastructure;
using Grand.SharedKernel;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
index 14268d7f9..7d4d369d1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PermissionController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.Models;
using Grand.Web.Common.Security.Authorization;
using Grand.Domain.Permissions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
index 6101b6860..c791ea8f4 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Common;
using Grand.Domain.Media;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs
index dbb77f6c7..f2b2a1dd5 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Plugins;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
index 959e2597b..6be4e7c7e 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductAttributeController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
index fef9a6ffb..4cb677459 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
@@ -1,16 +1,15 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Media;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
index 24a9ea9c3..457943d23 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductReviewController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs
index fd3409ada..82378653c 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductTagsController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs b/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs
index c75a0d285..7e7806fc7 100644
--- a/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/PushNotificationsController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.PushNotifications;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.PushNotifications;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
using Grand.Domain.PushNotifications;
diff --git a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs
index 6907f5ff1..e82aa8f43 100644
--- a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain;
using Grand.Domain.Messages;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
index 94f385a73..bb98e647e 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ReportsController.cs
@@ -1,16 +1,16 @@
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.System.Interfaces.Reports;
-using Grand.Business.System.Utilities;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Utilities.System;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
diff --git a/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs b/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs
index 1a6d17717..a24bb32d9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SalesEmployeeController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Documents;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+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.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs b/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
index e05fc46ec..2f40bb99f 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Tasks;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
diff --git a/src/Web/Grand.Web.Admin/Controllers/SearchController.cs b/src/Web/Grand.Web.Admin/Controllers/SearchController.cs
index 885e6bd2b..29e3c37c2 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SearchController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SearchController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using Grand.Domain;
using Grand.Domain.AdminSearch;
@@ -12,14 +12,14 @@ using Grand.Domain.Customers;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Settings;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Common.DataSource;
using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Common;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.Stores;
using Grand.Domain.Vendors;
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
index ae15363fd..4b970aa51 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+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.Blogs;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
index 116ceb272..65594dc7a 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShipmentController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Commands.Models.Shipping;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Pdf;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Commands.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Pdf;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
index 2527ba589..ed6f95f56 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
@@ -1,11 +1,10 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Models;
@@ -20,7 +19,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Grand.Web.Admin.Models.Common;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
index e1d6217b1..40caa3d67 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShoppingCartController.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Orders;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
index a45d14c5d..6288f61d1 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SpecificationAttributeController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Authorization;
diff --git a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
index 74f0780de..8433da074 100644
--- a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Stores;
diff --git a/src/Web/Grand.Web.Admin/Controllers/SystemController.cs b/src/Web/Grand.Web.Admin/Controllers/SystemController.cs
index 88ec0d3bc..e9109410e 100644
--- a/src/Web/Grand.Web.Admin/Controllers/SystemController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/SystemController.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Interfaces.MachineNameProvider;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+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.System.MachineNameProvider;
using Grand.Domain.Directory;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
diff --git a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
index def971278..afa4719a2 100644
--- a/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/TaxController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Security.Authorization;
@@ -13,11 +13,11 @@ using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Tax;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Admin.Models.Common;
using Grand.Domain.Directory;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Logging;
namespace Grand.Web.Admin.Controllers
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
index 9d6b2e3bb..ee0911c00 100644
--- a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Commands.Models;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Commands.Customers;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs
index 9b40542f1..5d6babcae 100644
--- a/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/VendorReviewController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
diff --git a/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs b/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs
index 11379957d..92f435915 100644
--- a/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/WidgetController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Cms;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Plugins;
diff --git a/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs b/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs
index 7d33fcce4..17b3f669a 100644
--- a/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/AttributeParserHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Addresses;
+using Grand.Business.Core.Interfaces.Common.Addresses;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Microsoft.AspNetCore.Http;
diff --git a/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs b/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs
index 8434b2bc0..7ca88318e 100644
--- a/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/LocalizedExtension.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Web.Common.Models;
using Grand.Domain;
using Grand.Domain.Localization;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs
index 1221c5d9e..58146583c 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/AddressMappingExtensions.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs
index e48e59966..cd731b494 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/BlogPostMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Blogs;
using Grand.Web.Admin.Models.Blogs;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerActionMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerActionMappingExtensions.cs
index 3065e8e8f..3eec57b86 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerActionMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerActionMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Customers;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerReminderMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerReminderMappingExtensions.cs
index a68d9250b..96b50e036 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerReminderMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/CustomerReminderMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Customers;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs
index 6144ced02..8ed004a40 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/DateTimeMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs
index b3e12489d..63bd6d0f7 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/DiscountMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Discounts;
using Grand.Web.Admin.Models.Discounts;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs
index 2edc11950..56eaba8db 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/GiftVoucherMappingExtensions.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure.Mapper;
using Grand.Domain.Orders;
using Grand.Web.Admin.Models.Orders;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/IExternalAuthenticationMethodMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/IExternalAuthenticationMethodMappingExtensions.cs
index a6d4974bb..fc14e3fe2 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/IExternalAuthenticationMethodMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/IExternalAuthenticationMethodMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.ExternalAuthentication;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs
index 0cab91e0a..f2725f010 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/IPaymentMethodMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Payments;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/IShippingRateComputationMethodMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/IShippingRateComputationMethodMappingExtensions.cs
index 1a74991dc..64f883b36 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/IShippingRateComputationMethodMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/IShippingRateComputationMethodMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Shipping;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/ITaxProviderMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/ITaxProviderMappingExtensions.cs
index b1f0e2ba1..bb0c6ad97 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/ITaxProviderMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/ITaxProviderMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Tax;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/IWidgetPluginMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/IWidgetPluginMappingExtensions.cs
index 381bede46..68e494afb 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/IWidgetPluginMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/IWidgetPluginMappingExtensions.cs
@@ -1,5 +1,5 @@
using Grand.Infrastructure.Mapper;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Admin.Models.Cms;
namespace Grand.Web.Admin.Extensions
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs
index 5f8ed8ef2..171a3b137 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/NewsItemMappingExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure.Mapper;
using Grand.Domain.News;
using Grand.Web.Admin.Models.News;
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs
index 7fd56a54c..d012fba41 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/PageMappingExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Mapper;
using Grand.Domain.Pages;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Admin.Models.Pages;
namespace Grand.Web.Admin.Extensions
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs
index ec7fd163f..b6a98fcc9 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/ProductsMappingExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Mapper;
using Grand.Domain.Catalog;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Extensions
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs
index 991b9bb68..050031c83 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/ScheduleTaskMappingExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Mapper;
using Grand.Domain.Tasks;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Admin.Models.Tasks;
namespace Grand.Web.Admin.Extensions.Mapping
diff --git a/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs
index dcc50524b..65b622759 100644
--- a/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/Mapping/TierPriceMappingExtensions.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Mapper;
using Grand.Domain.Catalog;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Extensions
diff --git a/src/Web/Grand.Web.Admin/Extensions/ProductList.cs b/src/Web/Grand.Web.Admin/Extensions/ProductList.cs
index a8d0a348b..dd98f9145 100644
--- a/src/Web/Grand.Web.Admin/Extensions/ProductList.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/ProductList.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs b/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
index 6f4029881..0b0a984ae 100644
--- a/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/UpdatePicture.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
namespace Grand.Web.Admin.Extensions
{
diff --git a/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs
index 82a77ad31..d047e7e34 100644
--- a/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs
+++ b/src/Web/Grand.Web.Admin/Extensions/WidgetExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Cms;
namespace Grand.Web.Admin.Extensions
diff --git a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj
index 9cd5afac4..9d77bfca5 100644
--- a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj
+++ b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj
@@ -5,8 +5,8 @@
<EnableDefaultContentItems>false</EnableDefaultContentItems>
</PropertyGroup>
<ItemGroup>
- <Content Include="Areas\**" CopyToPublishDirectory="Never"/>
- <Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest"/>
+ <Content Include="Areas\**" CopyToPublishDirectory="Never" />
+ <Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="elFinder.Net.AspNetCore" Version="1.4.4" />
@@ -16,16 +16,7 @@
<PackageReference Include="Google.Apis.AnalyticsReporting.v4" Version="1.57.0.2484" />
</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" />
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" />
<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
diff --git a/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs
index 9dc74d19d..d93eb33a7 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/ICustomerReminderViewModelService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Services.Customers;
+using Grand.Business.Core.Utilities.Marketing;
using Grand.Domain.Customers;
using Grand.Web.Admin.Models.Catalog;
using Grand.Web.Admin.Models.Customers;
diff --git a/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs
index 24df16e0f..de5ee8271 100644
--- a/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Interfaces/IDiscountViewModelService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Domain.Vendors;
diff --git a/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs b/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
index 615951f98..d7112cc2c 100644
--- a/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/BlogPostProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Blogs;
using Grand.Web.Admin.Models.Blogs;
diff --git a/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs b/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs
index 7697b77ab..ea1e2e742 100644
--- a/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/BrandProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs
index b9098eabc..066f5bf8f 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CategoryProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs
index 24015f995..b69f5933c 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CollectionProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Mapper/ExternalAuthenticationMethodProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ExternalAuthenticationMethodProfile.cs
index 1086515bb..911102d5c 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ExternalAuthenticationMethodProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ExternalAuthenticationMethodProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.ExternalAuthentication;
diff --git a/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs b/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs
index 9c6d593c6..c225d0bf2 100644
--- a/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/NewsItemProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.News;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.News;
diff --git a/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs b/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs
index 806d57f6d..29e7694d8 100644
--- a/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/PageProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Pages;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Pages;
diff --git a/src/Web/Grand.Web.Admin/Mapper/PaymentMethodProfile.cs b/src/Web/Grand.Web.Admin/Mapper/PaymentMethodProfile.cs
index 3b131ead6..738e3e647 100644
--- a/src/Web/Grand.Web.Admin/Mapper/PaymentMethodProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/PaymentMethodProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Payments;
diff --git a/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs
index 7346efb73..762f16faa 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ProductProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs
index 5c2745790..c2f27251f 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Checkout.Interfaces.Shipping;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Shipping;
diff --git a/src/Web/Grand.Web.Admin/Mapper/TaxProviderProfile.cs b/src/Web/Grand.Web.Admin/Mapper/TaxProviderProfile.cs
index 2cbe80045..29f4a2ff0 100644
--- a/src/Web/Grand.Web.Admin/Mapper/TaxProviderProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/TaxProviderProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Catalog.Interfaces.Tax;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
using Grand.Infrastructure.Mapper;
using Grand.Web.Admin.Models.Tax;
diff --git a/src/Web/Grand.Web.Admin/Mapper/VendorProfile.cs b/src/Web/Grand.Web.Admin/Mapper/VendorProfile.cs
index 6887feecc..b352c6998 100644
--- a/src/Web/Grand.Web.Admin/Mapper/VendorProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/VendorProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Grand.Infrastructure.Mapper;
using Grand.Domain.Vendors;
using Grand.Web.Admin.Models.Vendors;
diff --git a/src/Web/Grand.Web.Admin/Mapper/WidgetPluginProfile.cs b/src/Web/Grand.Web.Admin/Mapper/WidgetPluginProfile.cs
index 4b2d62bdc..1e1c620e5 100644
--- a/src/Web/Grand.Web.Admin/Mapper/WidgetPluginProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/WidgetPluginProfile.cs
@@ -1,6 +1,6 @@
using AutoMapper;
using Grand.Infrastructure.Mapper;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Admin.Models.Cms;
namespace Grand.Web.Admin.Mapper
diff --git a/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs
index 4dac6ccc5..4aad20a33 100644
--- a/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ActivityLogViewModelService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Logging;
diff --git a/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs
index 56f2c85ce..732245068 100644
--- a/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/AddressAttributeViewModelService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Domain.Common;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs
index cc0ab7052..03c200046 100644
--- a/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/AffiliateViewModelService.cs
@@ -1,10 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Affiliates;
using Grand.Domain.Directory;
using Grand.Domain.Payments;
diff --git a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
index f7b49f9ed..f1e685417 100644
--- a/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BlogViewModelService.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
index 1e58c86d1..fa8f5bd3d 100644
--- a/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/BrandViewModelService.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Domain.Seo;
diff --git a/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs
index b38f1f20f..8608cda14 100644
--- a/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CampaignViewModelService.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Campaigns;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Campaigns;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Messages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
index b005ca5a0..18bf6d900 100644
--- a/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CategoryViewModelService.cs
@@ -1,14 +1,14 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Domain.Seo;
diff --git a/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs
index b3548163c..5209f2887 100644
--- a/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CheckoutAttributeViewModelService.cs
@@ -1,10 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
@@ -15,7 +14,7 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Http;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
index 896b875a2..7e8f79f5f 100644
--- a/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CollectionViewModelService.cs
@@ -1,14 +1,14 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Domain.Seo;
diff --git a/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs
index dd2e72b93..0f075077f 100644
--- a/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ContactAttributeViewModelService.cs
@@ -1,8 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs
index 47cb4881e..458dfe525 100644
--- a/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ContactFormViewModelService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Messages;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs
index d9fcea8ca..c92e9fd11 100644
--- a/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CountryViewModelService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Directory;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
index aaed08d2e..9b9d9868a 100644
--- a/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CourseViewModelService.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Courses;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Courses;
using Grand.Domain.Seo;
diff --git a/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs
index 0b5c018f9..e38032b73 100644
--- a/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CurrencyViewModelService.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Directory;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Directory;
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs
index 717d3a345..07a601712 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerActionViewModelService.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Banners;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Banners;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs
index b76e17a4a..ea63749d3 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerAttributeViewModelService.cs
@@ -1,11 +1,11 @@
using Grand.Infrastructure;
using Grand.Domain.Customers;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs
index 4187efd29..6c5ec158e 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerGroupViewModelService.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs
index 427b31ca1..7336690b6 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerReminderViewModelService.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Marketing.Services.Customers;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
@@ -18,6 +17,7 @@ using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
+using Grand.Business.Core.Utilities.Marketing;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
index 66c085cec..b52ab8f33 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerReportViewModelService.cs
@@ -2,15 +2,15 @@
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Web.Common.Extensions;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Customers;
using Microsoft.AspNetCore.Mvc.Rendering;
-using Grand.Business.System.Interfaces.Reports;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.System.Reports;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs
index f0cfb4243..8cc8f8168 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerTagViewModelService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
index 28519f147..9b3a8ff5c 100644
--- a/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/CustomerViewModelService.cs
@@ -1,21 +1,20 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
index 7c687a019..a09bca3f8 100644
--- a/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/DiscountViewModelService.cs
@@ -1,16 +1,16 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Discounts;
using Grand.Domain.Vendors;
diff --git a/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs b/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs
index dd7399a91..c98ae8213 100644
--- a/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/DocumentViewModelService.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Documents;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Common;
using Grand.Domain.Documents;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
index 3a364db5d..b18e25a22 100644
--- a/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ElFinderViewModelService.cs
@@ -1,7 +1,7 @@
using elFinder.Net.AspNetCore.Extensions;
using elFinder.Net.AspNetCore.Helper;
using elFinder.Net.Core;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Media;
using Grand.SharedKernel.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs b/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs
index 54bad62f0..2cec13f77 100644
--- a/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/EmailAccountViewModelService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Messages;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs b/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs
index 0c3fe5b8c..56f74eb82 100644
--- a/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/GiftVoucherViewModelService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
@@ -13,7 +13,7 @@ using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Http;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Stores;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/GoogleAnalyticsViewModelService.cs b/src/Web/Grand.Web.Admin/Services/GoogleAnalyticsViewModelService.cs
index c9fee8d9b..20f5eaa50 100644
--- a/src/Web/Grand.Web.Admin/Services/GoogleAnalyticsViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/GoogleAnalyticsViewModelService.cs
@@ -2,8 +2,8 @@
using Google.Apis.AnalyticsReporting.v4.Data;
using Google.Apis.Auth.OAuth2;
using Google.Apis.Services;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Seo;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Common;
diff --git a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
index b81852730..d8f4ca0b5 100644
--- a/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/KnowledgebaseViewModelService.cs
@@ -1,11 +1,10 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Domain.Knowledgebase;
using Grand.Domain.Seo;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
index 05b6313c4..541400991 100644
--- a/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/LanguageViewModelService.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Localization;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Localization;
diff --git a/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs b/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs
index 8a77b8880..01f034501 100644
--- a/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/LogViewModelService.cs
@@ -1,15 +1,15 @@
using Grand.Infrastructure;
using Grand.Domain.Logging;
using Grand.Web.Common.Extensions;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Logging;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Admin.Services
{
diff --git a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
index 2b22e373d..829bf992c 100644
--- a/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/MerchandiseReturnViewModelService.cs
@@ -1,13 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Common.Extensions;
using Grand.Domain.Common;
using Grand.Domain.Directory;
diff --git a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
index 715786bb3..70b7e9c56 100644
--- a/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/NewsViewModelService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.News;
using Grand.Domain.Seo;
using Grand.Web.Common.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index ce489fa8f..a06697b50 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -1,25 +1,22 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
-using Grand.Business.System.Interfaces.Reports;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
+using Grand.Business.Core.Interfaces.System.Reports;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
index 20dcd4b59..b48207750 100644
--- a/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/PageViewModelService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.Seo;
using Grand.Domain.Pages;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs b/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
index 8957472ec..fe45fd0c5 100644
--- a/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/PictureViewModelService.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Common;
diff --git a/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
index a680a6b73..c08038d45 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductReviewViewModelService.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Events.Models;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Events.Catalog;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Web.Common.Extensions;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index 5e67f36cf..538393512 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -1,21 +1,20 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Directory;
diff --git a/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs
index 5297d6a19..78eb6e5dc 100644
--- a/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ShipmentViewModelService.cs
@@ -1,14 +1,12 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Directory;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs b/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
index b1a03bf36..6a988400d 100644
--- a/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/StoreViewModelService.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.Stores;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Interfaces;
diff --git a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
index d0f1972c9..ac47028ce 100644
--- a/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/VendorViewModelService.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Events;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain;
using Grand.Domain.Directory;
using Grand.Domain.Discounts;
diff --git a/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs
index 72c853ddf..aca80ce27 100644
--- a/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Affiliate/AffiliateValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Affiliates;
namespace Grand.Web.Admin.Validators.Blogs
diff --git a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs
index 1af5938e7..4645d21f1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogCategoryValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Blogs;
namespace Grand.Web.Admin.Validators.Blogs
diff --git a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs
index d9055f193..fe18b83b7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Blogs/BlogPostValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Blogs;
namespace Grand.Web.Admin.Validators.Blogs
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
index 70fb8aa8e..47e256a17 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddAssociatedProductModelValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
index 3fa3283b3..c80f56de7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddBundleProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
index 58d6c856d..6e0d8a2fd 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCategoryProductModelValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
index 3241db7ea..c6279245e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCollectionProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
index 1933206e3..ca2bc89a2 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddCrossSellProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
index 054ce8107..e04b16cb7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddProductSpecificationAttributeModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
index aa78a0058..2491a7ab5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddRelatedProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
index fc175ca6f..9bc4a2b11 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AddSimilarProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
index ea33d8075..6bf0b1b91 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/AssociatedProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs
index 338c1bad7..900e833c7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/BrandValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
index 8712c719f..a93b274b7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/BundleProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
index 003703fcc..aaced70d2 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryProductModelValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs
index 58b445a51..ee977dec1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CategoryValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
index d058cca63..4a899b05b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs
index 5cc5a843b..822667853 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CollectionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
index 551bb7bcc..160b3813a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/CrossSellProductModelValidator.cs
@@ -1,10 +1,10 @@
using FluentValidation;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Models.Catalog;
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
namespace Grand.Web.Admin.Validators.Catalog
{
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs
index 3f49b9c5e..27b77ddc8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/PredefinedProductAttributeValueModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
index 9818ff8a7..f603e5be1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeMappingModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs
index 8c2a63e14..2cce5b7f5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
index b5fb6d976..52671c18a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductAttributeValueModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
index e356588f5..a328ffc0d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCategoryModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
index 03bb01f1d..915b5dba4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductCollectionModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
index a9017b71e..cb8a98248 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductPictureModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs
index 447fde6d8..8009871a6 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductReviewValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
index 11e95e35e..031645d6d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductSpecificationAttributeModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs
index 3356af2d6..e0e85a6d0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductTagValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs
index 937cb4edb..4f1f7d9e9 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/ProductValidator.cs
@@ -2,7 +2,7 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
index cfac7d3d2..b0a976ad8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/RelatedProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
index 87805b1b8..738ff2aa4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SimilarProductModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs
index 18a7f162d..dca7b8ca0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeOptionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs
index 6c791315c..c74676504 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/SpecificationAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Catalog;
namespace Grand.Web.Admin.Validators.Catalog
diff --git a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
index 89217403e..46b0b2ada 100644
--- a/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Catalog/TierPriceModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Extensions;
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs
index 28a497ac4..19dd3ce55 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Validators.Common
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs
index 26b3c5ca6..6be920427 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/AddressAttributeValueValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Validators.Common
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs
index bf4b25ecc..89666ba47 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/AddressValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Validators.Common
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs
index 3b1a0fb3e..48380e503 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/LoginValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Validators.Common
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs
index 93685c7ba..4f92b341b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/ReviewValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Validators.Common
diff --git a/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs b/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs
index 976724f63..e78baea78 100644
--- a/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Common/UserFieldValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Common;
namespace Grand.Web.Admin.Validators.Common
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs
index 7e2cc5abc..caf0263be 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseLessonValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Courses;
namespace Grand.Web.Admin.Validators.Courses
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs
index 18f6be93d..4721015ba 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseLevelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Courses;
namespace Grand.Web.Admin.Validators.Courses
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs
index 528953fca..19efc3b98 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseSubjectValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Courses;
namespace Grand.Web.Admin.Validators.Courses
diff --git a/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs b/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs
index c094113ce..8fbda952b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Course/CourseValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Courses;
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs
index a9dc7cefe..f28f2823c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionConditionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs
index 2d06436f1..df51846ef 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerActionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs
index 788607bf4..7e77d0cfa 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAddressValidator.cs
@@ -1,5 +1,5 @@
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Validators.Common;
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs
index b57f0fd1d..4da9aaebd 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs
index 0101cf967..1d2022f1b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerAttributeValueValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs
index bfd543d6c..39bec011a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerGroupValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs
index 7ef8ffc1e..8b96088e8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerReminderValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs
index c1ad56bda..af08beba0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerTagValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs
index 110df5934..695af5aa0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/CustomerValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs
index ca657622b..30aa5cab1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/SalesEmployeeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
using Grand.Web.Admin.Validators.Common;
diff --git a/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs b/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs
index 64857b6a5..b8409638e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Customers/UserApiValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Customers;
namespace Grand.Web.Admin.Validators.Customers
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs
index e8c94084e..f2bc665e8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/CountryValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Directory;
namespace Grand.Web.Admin.Validators.Directory
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs
index b4110e20c..f49d8304d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/CurrencyValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Directory;
using System.Globalization;
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs
index 83cf1a12f..7d47491ba 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureDimensionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Directory;
namespace Grand.Web.Admin.Validators.Directory
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs
index 92b88687a..988d1e0cd 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureUnitValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Directory;
namespace Grand.Web.Admin.Validators.Directory
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs
index c64dcd324..475008fa5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/MeasureWeightValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Directory;
namespace Grand.Web.Admin.Validators.Directory
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs
index 439968dcd..19d85b996 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/RobotsTxtValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Directory;
diff --git a/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs b/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs
index 1ff5fa001..2bd439290 100644
--- a/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Directory/StateProvinceValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Directory;
namespace Grand.Web.Admin.Validators.Directory
diff --git a/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs b/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs
index 5afc188db..1803297a5 100644
--- a/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Discounts/DiscountValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Discounts;
namespace Grand.Web.Admin.Validators.Discounts
diff --git a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs
index 37e69ca4a..949663b14 100644
--- a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentTypeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Documents;
namespace Grand.Web.Admin.Validators.Documents
diff --git a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs
index f8e05230f..8ab99f53f 100644
--- a/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Documents/DocumentValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Documents;
namespace Grand.Web.Admin.Validators.Documents
diff --git a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs
index 8d5046651..8d1d3d27c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseArticleModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Knowledgebase;
diff --git a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
index 38677105c..7a75e776c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Knowledgebase/KnowledgebaseCategoryModelValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Knowledgebase;
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs
index ed2f7c7a8..79407692c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/BrandLayoutValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Layouts;
namespace Grand.Web.Admin.Validators.Layouts
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs
index 38c9305e5..8711cd25c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/CategoryLayoutValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Layouts;
namespace Grand.Web.Admin.Validators.Layouts
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs
index bb3417400..9b55ed42a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/CollectionLayoutValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Layouts;
namespace Grand.Web.Admin.Validators.Layouts
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs
index 940b2b5eb..dbdd336da 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/PageLayoutValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Layouts;
namespace Grand.Web.Admin.Validators.Layouts
diff --git a/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs b/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs
index c657419f8..9f375d065 100644
--- a/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Layouts/ProductLayoutValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Layouts;
namespace Grand.Web.Admin.Validators.Layouts
diff --git a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs
index a8bc78568..8555d8977 100644
--- a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageResourceValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Localization;
namespace Grand.Web.Admin.Validators.Localization
diff --git a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs
index d004d5ad1..99d46b7db 100644
--- a/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Localization/LanguageValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Localization;
using System.Globalization;
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs
index 4a36f2951..d5a3d6410 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/BannerValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs
index 1f99c5653..578dc83df 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/CampaignValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs
index 40b801918..a632d01b7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
index a8b402e4b..7238b8e77 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/ContactAttributeValueValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs
index 441432dde..57e94015d 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/EmailAccountValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs
index 88bef058f..ff053b39b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs
index f0994e2b9..5ce4085b4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormAttributeValueValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs
index bcbc7c2b5..5ea738989 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/InteractiveFormValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs
index b975a5761..18d7fa54e 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/MessageTemplateValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs
index 04d56edef..e53019bac 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/NewsLetterSubscriptionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs
index b13e922ce..ca735d786 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/NewsletterCategoryValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs b/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs
index 547eee12e..c94fba157 100644
--- a/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Messages/QueuedEmailValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Messages;
namespace Grand.Web.Admin.Validators.Messages
diff --git a/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs b/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs
index a1b6c6a21..b8f5e0f27 100644
--- a/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/News/NewsItemValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.News;
namespace Grand.Web.Admin.Validators.News
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs
index e7f007080..b930fe3d4 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Orders;
namespace Grand.Web.Admin.Validators.Orders
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
index 43dafa51a..aba6a739c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Orders;
namespace Grand.Web.Admin.Validators.Orders
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs
index aa012f30d..5c2ac7ba1 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/GiftVoucherValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Orders;
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs
index 806842904..1e80cf886 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/OrderStatusValidator.cs
@@ -1,5 +1,5 @@
using FluentValidation;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure.Validators;
using Grand.Web.Admin.Models.Orders;
diff --git a/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs b/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs
index 5c0de1795..0471c0ca0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Pages/PageValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Pages;
namespace Grand.Web.Admin.Validators.Pages
diff --git a/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs b/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs
index 1584503b6..87179def8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Plugins/PluginValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Plugins;
namespace Grand.Web.Admin.Validators.Plugins
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs
index 10690d55f..be6757487 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/LoyaltyPointsSettingsValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Orders;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Settings;
namespace Grand.Web.Admin.Validators.Settings
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs
index 0a101a4db..e0d98e51a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnActionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Settings;
namespace Grand.Web.Admin.Validators.Settings
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs
index df4fe3867..8fa18e08b 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/MerchandiseReturnReasonValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Settings;
namespace Grand.Web.Admin.Validators.Settings
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs
index aebaae66a..76934dc1c 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/OrderSettingsValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Orders;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Settings;
namespace Grand.Web.Admin.Validators.Settings
diff --git a/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs b/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs
index d26fb9f4e..46f3e5fd8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Settings/SettingValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Settings;
namespace Grand.Web.Admin.Validators.Settings
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs
index 0a36aa489..55d8d28a7 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/DeliveryDateValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Shipping;
namespace Grand.Web.Admin.Validators.Shipping
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs
index f4bcec71f..687fe21d6 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/PickupPointValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Shipping;
namespace Grand.Web.Admin.Validators.Shipping
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs
index cdacdc893..2cc87a739 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/ShippingMethodValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Shipping;
namespace Grand.Web.Admin.Validators.Shipping
diff --git a/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs b/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs
index 4546cf4cc..396d486b0 100644
--- a/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Shipping/WarehouseValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Shipping;
namespace Grand.Web.Admin.Validators.Shipping
diff --git a/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs b/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
index 7716c101c..39bf66855 100644
--- a/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Stores/DomainHostValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Stores;
namespace Grand.Web.Admin.Validators.Stores
diff --git a/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs b/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs
index 7ffa7f090..da1caae7a 100644
--- a/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Stores/StoreValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Stores;
namespace Grand.Web.Admin.Validators.Stores
diff --git a/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs b/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs
index 6e4e7396e..9086a2c37 100644
--- a/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Tax/TaxCategoryValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Tax;
namespace Grand.Web.Admin.Validators.Tax
diff --git a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs
index 4f82cbec7..f1ad4bd75 100644
--- a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorReviewValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Vendors;
namespace Grand.Web.Admin.Validators.Vendors
diff --git a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs
index 4ac373a89..dd8d1b7a8 100644
--- a/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Vendors/VendorValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Admin.Models.Vendors;
using Grand.Web.Admin.Validators.Common;
diff --git a/src/Web/Grand.Web.Common/Controllers/BaseController.cs b/src/Web/Grand.Web.Common/Controllers/BaseController.cs
index 734ea988c..48e5d07dd 100644
--- a/src/Web/Grand.Web.Common/Controllers/BaseController.cs
+++ b/src/Web/Grand.Web.Common/Controllers/BaseController.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Infrastructure;
using Grand.Web.Common.DataSource;
using Grand.Web.Common.Events;
diff --git a/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs b/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs
index 800dac668..24e9b9301 100644
--- a/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs
+++ b/src/Web/Grand.Web.Common/Extensions/CommonExtensions.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Grand.Web.Common.DataSource;
using Microsoft.AspNetCore.Http;
diff --git a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
index 79596d49a..6668ff71f 100644
--- a/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AffiliateAttribute.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Affiliates;
using Grand.Domain.Data;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
index 5651945e5..a442c91e1 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeAdminAttribute.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Data;
using Grand.Domain.Security;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
index 6c9543de9..b0c77a8f8 100644
--- a/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/AuthorizeVendorAttribute.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Data;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
index 319d54752..fac78aacc 100644
--- a/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/ClosedStoreAttribute.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Data;
using Grand.Domain.Stores;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
index a4cb86d67..b589aedb0 100644
--- a/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/CustomerActivityAttribute.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Data;
diff --git a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
index 7709d89e6..1ca62ac4d 100644
--- a/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/LanguageAttribute.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Data;
using Grand.Domain.Localization;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
index 9c29661a6..be3cbd09b 100644
--- a/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PasswordExpiredAttribute.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Queries.Models;
+using Grand.Business.Core.Queries.Customers;
using Grand.Domain.Data;
using Grand.Infrastructure;
using MediatR;
diff --git a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
index e5f43a3d7..6f17fd049 100644
--- a/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
+++ b/src/Web/Grand.Web.Common/Filters/PublicStoreAttribute.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Data;
using Grand.Domain.Stores;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
index 024f4f572..d9aa3a713 100644
--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
@@ -15,12 +15,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.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.Storage\Grand.Business.Storage.csproj" />
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />
+ <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>
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
index 5d012696b..0674808f2 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ApplicationBuilderExtensions.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Logging;
using Grand.Domain.Common;
using Grand.Domain.Data;
using Grand.Infrastructure;
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs b/src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs
similarity index 96%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs
rename to src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs
index 447b40188..6ceb21b5a 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/BackgroundServiceTask.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.System.Interfaces.ScheduleTasks;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Infrastructure;
using Grand.Domain.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-namespace Grand.Business.System.Services.BackgroundServices
+namespace Grand.Web.Common.Infrastructure
{
public class BackgroundServiceTask : BackgroundService
{
diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
index f948772dd..ec2f644d5 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Authentication.Utilities;
-using Grand.Business.Common.Interfaces.Configuration;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Configuration;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Authentication;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Configuration;
using Grand.Domain.Data;
using Grand.Infrastructure;
@@ -177,13 +177,13 @@ namespace Grand.Web.Common.Infrastructure
public static IMvcBuilder AddGrandMvc(this IServiceCollection services, IConfiguration configuration)
{
//add basic MVC feature
- var mvcBuilder = services.AddMvc();
+ var mvcBuilder = services.AddControllersWithViews();
//add view localization
mvcBuilder.AddViewLocalization();
//add razor runtime compilation
mvcBuilder.AddRazorRuntimeCompilation();
-
+
var securityConfig = new SecurityConfig();
configuration.GetSection("Security").Bind(securityConfig);
diff --git a/src/Web/Grand.Web.Common/Localization/LocService.cs b/src/Web/Grand.Web.Common/Localization/LocService.cs
index 8639f12b1..0e4919398 100644
--- a/src/Web/Grand.Web.Common/Localization/LocService.cs
+++ b/src/Web/Grand.Web.Common/Localization/LocService.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Microsoft.Extensions.Localization;
namespace Grand.Web.Common.Localization
diff --git a/src/Web/Grand.Web.Common/Menu/SiteMap.cs b/src/Web/Grand.Web.Common/Menu/SiteMap.cs
index 1f665c81b..389f5f250 100644
--- a/src/Web/Grand.Web.Common/Menu/SiteMap.cs
+++ b/src/Web/Grand.Web.Common/Menu/SiteMap.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.System.Interfaces.Admin;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.System.Admin;
using Grand.Domain.Admin;
namespace Grand.Web.Common.Menu
diff --git a/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs b/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs
index 4188084fb..9d23c0250 100644
--- a/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs
+++ b/src/Web/Grand.Web.Common/Routing/SlugRouteTransformer.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
using Grand.Infrastructure.Configuration;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Routing;
diff --git a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs
index 2283431da..788f509d0 100644
--- a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs
+++ b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeActionAttribute.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Web.Common.DataSource;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
diff --git a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs
index a4412eddf..3ed99c3a6 100644
--- a/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs
+++ b/src/Web/Grand.Web.Common/Security/Authorization/PermissionAuthorizeAttribute.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Routing;
diff --git a/src/Web/Grand.Web.Common/Security/Captcha/CaptchaSettingsExtension.cs b/src/Web/Grand.Web.Common/Security/Captcha/CaptchaSettingsExtension.cs
index debc41e46..f2551b83c 100644
--- a/src/Web/Grand.Web.Common/Security/Captcha/CaptchaSettingsExtension.cs
+++ b/src/Web/Grand.Web.Common/Security/Captcha/CaptchaSettingsExtension.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
namespace Grand.Web.Common.Security.Captcha
{
diff --git a/src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs b/src/Web/Grand.Web.Common/Startup/TaskHandler.cs
similarity index 90%
rename from src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs
rename to src/Web/Grand.Web.Common/Startup/TaskHandler.cs
index b34cc870d..382699970 100644
--- a/src/Web/Grand.Web.Common/Startup/TaskHandlerHelper.cs
+++ b/src/Web/Grand.Web.Common/Startup/TaskHandler.cs
@@ -1,15 +1,15 @@
-using Grand.Business.System.Interfaces.ScheduleTasks;
-using Grand.Business.System.Services.BackgroundServices;
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Data;
using Grand.Infrastructure.Configuration;
using Grand.Infrastructure.Plugins;
using Grand.Infrastructure.TypeSearchers;
+using Grand.Web.Common.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
namespace Grand.Web.Common.Startup
{
- public static class TaskHandlerHelper
+ public static class TaskHandler
{
public static void RegisterTasks(this IServiceCollection services)
diff --git a/src/Web/Grand.Web.Common/StoreHelper.cs b/src/Web/Grand.Web.Common/StoreHelper.cs
index 7eb865ed2..fbac728a0 100644
--- a/src/Web/Grand.Web.Common/StoreHelper.cs
+++ b/src/Web/Grand.Web.Common/StoreHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Domain.Stores;
using Grand.Infrastructure;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs
index e104be4a5..6a1b69c0d 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminDeleteConfirmationTagHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Html;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
index d08569ff4..9b6517067 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminLabelTagHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs
index 6e9918b8f..879f32f75 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminSelectTagHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs
index ad9f704b5..7a98e3350 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/DatePickerDropDownsTagHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs
index 877cdb7eb..0f9151233 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/LocalizedEditorTagHelper.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Mvc.Razor;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
index 9288b615d..45ccf7474 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Common.Extensions;
using Grand.Web.Common.Page.Paging;
using Microsoft.AspNetCore.Mvc.Rendering;
diff --git a/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs
index c60bd9a01..e1e00316d 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/PictureSourceTagHelper.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Microsoft.AspNetCore.Razor.TagHelpers;
namespace Grand.Web.Common.TagHelpers
diff --git a/src/Web/Grand.Web.Common/Themes/ThemeContext.cs b/src/Web/Grand.Web.Common/Themes/ThemeContext.cs
index b8efe15af..91cc01b40 100644
--- a/src/Web/Grand.Web.Common/Themes/ThemeContext.cs
+++ b/src/Web/Grand.Web.Common/Themes/ThemeContext.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web.Common/WorkContext.cs b/src/Web/Grand.Web.Common/WorkContext.cs
index ee57accad..da6b4ec83 100644
--- a/src/Web/Grand.Web.Common/WorkContext.cs
+++ b/src/Web/Grand.Web.Common/WorkContext.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
diff --git a/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
index 292cd574c..96e6b64e9 100644
--- a/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Blogs/InsertBlogCommentCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Blogs;
using Grand.Domain.Localization;
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs
index a05e76ab5..0861083d8 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/ContactAttributeChangeCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Commands.Models.Common;
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs
index c29365786..4af4ceb72 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsCommandHandler.cs
@@ -1,6 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Common.Security.Captcha;
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs
index 02068ad17..666fba664 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/ContactUsSendCommandHandler.cs
@@ -1,10 +1,9 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Stores;
diff --git a/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs
index 75f41165d..34ebf5fc8 100644
--- a/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Common/PopupInteractiveCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Messages;
using Grand.Web.Commands.Models.Common;
diff --git a/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
index 8131bb1aa..eac9e0302 100644
--- a/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Courses/CourseLessonApprovedCommandHandler.cs
@@ -1,5 +1,5 @@
using Grand.Domain.Courses;
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Web.Commands.Models.Courses;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
index 7db1566d4..de30b75d8 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/CurrentPositionCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
index 8e514a026..90b6c86b9 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/CustomerRegisteredCommandHandler.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
index 24de29bdd..16704833c 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/DeleteAccountCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Web.Commands.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
index 88dbcf00f..13d1fc395 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/PasswordRecoverySendCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
index 153dfd0fb..7d80a37b6 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountAddCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
index c2fb5bd34..741d93418 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountDeleteCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
index 72c2eb152..0429f890a 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/SubAccountEditCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using Grand.Web.Commands.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
index facd74cae..bfd4ebd74 100644
--- a/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Customers/UpdateCustomerInfoCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Domain.Customers;
using Grand.Domain.Messages;
using Grand.Domain.Tax;
diff --git a/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
index cabf38d54..3a50e4bf4 100644
--- a/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/News/InsertNewsCommentCommandHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Localization;
using Grand.Domain.News;
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
index daf674434..e8034a3f9 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscribeNewsletterHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Newsletters;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Messages;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
index c4459ec48..b4fb66f69 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionActivationHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Models.Newsletter;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
index badf23c55..b4756e582 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Web.Commands.Models.Newsletter;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
index 1154b46b0..00cba0d62 100644
--- a/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Orders/InsertOrderNoteCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Orders;
using Grand.Web.Commands.Models.Orders;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
index 76f97329d..a3f65f383 100644
--- a/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Orders/MerchandiseReturnSubmitCommandHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
index 7f7bb85af..d837fbd98 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/InsertProductReviewCommandHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Commands.Models;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Commands.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
index f0ea7786c..381c6d6ca 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/SendProductAskQuestionMessageCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Products;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
index 30139436d..9e780221b 100644
--- a/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Products/SendProductEmailAFriendMessageCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.SharedKernel.Extensions;
using Grand.Web.Commands.Models.Products;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
index fed02a631..f35a50320 100644
--- a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
index b1e85b1e2..4ec03b2f2 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/ContactVendorCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Common;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
index 4cad615dc..a721a8c77 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/InsertVendorReviewCommandHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Domain.Localization;
using Grand.Domain.Vendors;
diff --git a/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
index 7659245f7..919222218 100644
--- a/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Vendors/SetVendorReviewHelpfulnessCommandHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Vendors;
using Grand.Web.Commands.Models.Vendors;
using MediatR;
diff --git a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs
index 717d25cca..cf9a94da2 100644
--- a/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Customers/SubAccountAddCommand.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Utilities;
+using Grand.Business.Core.Utilities.Customers;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Components/BlogPostProducts.cs b/src/Web/Grand.Web/Components/BlogPostProducts.cs
index 98cf8432a..7263719dd 100644
--- a/src/Web/Grand.Web/Components/BlogPostProducts.cs
+++ b/src/Web/Grand.Web/Components/BlogPostProducts.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Components/CrossSellProducts.cs b/src/Web/Grand.Web/Components/CrossSellProducts.cs
index 332dbab11..6b1db8919 100644
--- a/src/Web/Grand.Web/Components/CrossSellProducts.cs
+++ b/src/Web/Grand.Web/Components/CrossSellProducts.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Domain.Orders;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs b/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
index 5a1060e82..7f088f21a 100644
--- a/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
+++ b/src/Web/Grand.Web/Components/CustomerRecommendedProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Components/EmailWishlist.cs b/src/Web/Grand.Web/Components/EmailWishlist.cs
index 8453bc53c..dfd44cf3f 100644
--- a/src/Web/Grand.Web/Components/EmailWishlist.cs
+++ b/src/Web/Grand.Web/Components/EmailWishlist.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Orders;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/EstimateShipping.cs b/src/Web/Grand.Web/Components/EstimateShipping.cs
index c01633546..8bf163094 100644
--- a/src/Web/Grand.Web/Components/EstimateShipping.cs
+++ b/src/Web/Grand.Web/Components/EstimateShipping.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Infrastructure;
using Grand.Domain.Orders;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/ExternalMethods.cs b/src/Web/Grand.Web/Components/ExternalMethods.cs
index cb059a8a4..3bd253f7c 100644
--- a/src/Web/Grand.Web/Components/ExternalMethods.cs
+++ b/src/Web/Grand.Web/Components/ExternalMethods.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Authentication.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Components/Footer.cs b/src/Web/Grand.Web/Components/Footer.cs
index 870e25ac3..257c15797 100644
--- a/src/Web/Grand.Web/Components/Footer.cs
+++ b/src/Web/Grand.Web/Components/Footer.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web/Components/HomePageBestSellers.cs b/src/Web/Grand.Web/Components/HomePageBestSellers.cs
index d26e25b3a..594a431ec 100644
--- a/src/Web/Grand.Web/Components/HomePageBestSellers.cs
+++ b/src/Web/Grand.Web/Components/HomePageBestSellers.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.System.Interfaces.Reports;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.System.Reports;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web/Components/HomePageNewProducts.cs b/src/Web/Grand.Web/Components/HomePageNewProducts.cs
index 657b2bbd8..7d4413dcc 100644
--- a/src/Web/Grand.Web/Components/HomePageNewProducts.cs
+++ b/src/Web/Grand.Web/Components/HomePageNewProducts.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Infrastructure;
+using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
using MediatR;
using Microsoft.AspNetCore.Mvc;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Components
{
@@ -39,8 +39,7 @@ namespace Grand.Web.Components
if (!_catalogSettings.NewProductsOnHomePage)
return Content("");
- var products = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ var products = (await _mediator.Send(new GetSearchProductsQuery() {
Customer = _workContext.CurrentCustomer,
StoreId = _workContext.CurrentStore.Id,
VisibleIndividuallyOnly = true,
@@ -52,8 +51,7 @@ namespace Grand.Web.Components
if (!products.Any())
return Content("");
- var model = await _mediator.Send(new GetProductOverview()
- {
+ var model = await _mediator.Send(new GetProductOverview() {
PreparePictureModel = true,
PreparePriceModel = true,
PrepareSpecificationAttributes = _catalogSettings.ShowSpecAttributeOnCatalogPages,
diff --git a/src/Web/Grand.Web/Components/HomePageProducts.cs b/src/Web/Grand.Web/Components/HomePageProducts.cs
index ac4a933e5..092bcad06 100644
--- a/src/Web/Grand.Web/Components/HomePageProducts.cs
+++ b/src/Web/Grand.Web/Components/HomePageProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
diff --git a/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs b/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
index 625594d2a..e4ef68b1e 100644
--- a/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
+++ b/src/Web/Grand.Web/Components/KnowledgebaseCategories.cs
@@ -1,10 +1,10 @@
using Grand.Infrastructure;
using Grand.Domain.Knowledgebase;
using Grand.Web.Common.Components;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.ViewComponents
{
diff --git a/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs b/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
index 7f52d06fc..30763aa90 100644
--- a/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
+++ b/src/Web/Grand.Web/Components/KnowledgebaseHomepageArticles.cs
@@ -1,10 +1,10 @@
using Grand.Infrastructure;
using Grand.Domain.Knowledgebase;
using Grand.Web.Common.Components;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Web.Models.Knowledgebase;
using Microsoft.AspNetCore.Mvc;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Components
{
diff --git a/src/Web/Grand.Web/Components/Menu.cs b/src/Web/Grand.Web/Components/Menu.cs
index bffd49d90..ebfbdde7d 100644
--- a/src/Web/Grand.Web/Components/Menu.cs
+++ b/src/Web/Grand.Web/Components/Menu.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Components/OrderSummary.cs b/src/Web/Grand.Web/Components/OrderSummary.cs
index 9810bdae9..36ca36b58 100644
--- a/src/Web/Grand.Web/Components/OrderSummary.cs
+++ b/src/Web/Grand.Web/Components/OrderSummary.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Infrastructure;
using Grand.Domain.Orders;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/OrderTotals.cs b/src/Web/Grand.Web/Components/OrderTotals.cs
index e300abbd5..42ad3aeec 100644
--- a/src/Web/Grand.Web/Components/OrderTotals.cs
+++ b/src/Web/Grand.Web/Components/OrderTotals.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Infrastructure;
using Grand.Domain.Orders;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/PersonalizedProducts.cs b/src/Web/Grand.Web/Components/PersonalizedProducts.cs
index 64d7584ad..b5e782c69 100644
--- a/src/Web/Grand.Web/Components/PersonalizedProducts.cs
+++ b/src/Web/Grand.Web/Components/PersonalizedProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/PopupAction.cs b/src/Web/Grand.Web/Components/PopupAction.cs
index b770f1737..c18a64674 100644
--- a/src/Web/Grand.Web/Components/PopupAction.cs
+++ b/src/Web/Grand.Web/Components/PopupAction.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
using Grand.Web.Events;
diff --git a/src/Web/Grand.Web/Components/ProductEmailAFriend.cs b/src/Web/Grand.Web/Components/ProductEmailAFriend.cs
index 8c8e798e7..230d7c187 100644
--- a/src/Web/Grand.Web/Components/ProductEmailAFriend.cs
+++ b/src/Web/Grand.Web/Components/ProductEmailAFriend.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/ProductReviews.cs b/src/Web/Grand.Web/Components/ProductReviews.cs
index 4f5fda0ed..8e282d0fb 100644
--- a/src/Web/Grand.Web/Components/ProductReviews.cs
+++ b/src/Web/Grand.Web/Components/ProductReviews.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs b/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
index dd8f21bf9..10264589b 100644
--- a/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
+++ b/src/Web/Grand.Web/Components/ProductsAlsoPurchased.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.System.Interfaces.Reports;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.System.Reports;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs b/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
index 6c1b123b0..88126f29e 100644
--- a/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
+++ b/src/Web/Grand.Web/Components/RecentlyViewedProductsBlock.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/RecommendedProducts.cs b/src/Web/Grand.Web/Components/RecommendedProducts.cs
index 65f769f22..505e57910 100644
--- a/src/Web/Grand.Web/Components/RecommendedProducts.cs
+++ b/src/Web/Grand.Web/Components/RecommendedProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Components/RelatedProducts.cs b/src/Web/Grand.Web/Components/RelatedProducts.cs
index 215d2119f..ddac5b00e 100644
--- a/src/Web/Grand.Web/Components/RelatedProducts.cs
+++ b/src/Web/Grand.Web/Components/RelatedProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Components/SimilarProducts.cs b/src/Web/Grand.Web/Components/SimilarProducts.cs
index 4e8674d1c..17aaba970 100644
--- a/src/Web/Grand.Web/Components/SimilarProducts.cs
+++ b/src/Web/Grand.Web/Components/SimilarProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
using Grand.Web.Features.Models.Products;
diff --git a/src/Web/Grand.Web/Components/SuggestedProducts.cs b/src/Web/Grand.Web/Components/SuggestedProducts.cs
index 1e4c72956..dff179bc0 100644
--- a/src/Web/Grand.Web/Components/SuggestedProducts.cs
+++ b/src/Web/Grand.Web/Components/SuggestedProducts.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Queries.Models;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/VendorContact.cs b/src/Web/Grand.Web/Components/VendorContact.cs
index 3d2d07aa7..5839feba4 100644
--- a/src/Web/Grand.Web/Components/VendorContact.cs
+++ b/src/Web/Grand.Web/Components/VendorContact.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Vendors;
diff --git a/src/Web/Grand.Web/Components/VendorReviews.cs b/src/Web/Grand.Web/Components/VendorReviews.cs
index 50a449eae..722a7654d 100644
--- a/src/Web/Grand.Web/Components/VendorReviews.cs
+++ b/src/Web/Grand.Web/Components/VendorReviews.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Vendors;
using Grand.Infrastructure;
using Grand.Web.Common.Components;
diff --git a/src/Web/Grand.Web/Components/Widget.cs b/src/Web/Grand.Web/Components/Widget.cs
index 9faa756ff..7103236fc 100644
--- a/src/Web/Grand.Web/Components/Widget.cs
+++ b/src/Web/Grand.Web/Components/Widget.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Domain.Customers;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.cs
index e76a10ec1..b167d4737 100644
--- a/src/Web/Grand.Web/Controllers/AccountController.cs
+++ b/src/Web/Grand.Web/Controllers/AccountController.cs
@@ -1,14 +1,14 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Events;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Customers.Queries.Models;
-using Grand.Business.Customers.Utilities;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.System.Interfaces.ExportImport;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Queries.Customers;
+using Grand.Business.Core.Utilities.Customers;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.System.ExportImport;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Stores;
diff --git a/src/Web/Grand.Web/Controllers/ActionCartController.cs b/src/Web/Grand.Web/Controllers/ActionCartController.cs
index c1a5d8878..68a71c1da 100644
--- a/src/Web/Grand.Web/Controllers/ActionCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ActionCartController.cs
@@ -1,11 +1,10 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Utilities.Checkout;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Orders;
@@ -492,7 +491,7 @@ namespace Grand.Web.Controllers
});
addToCartWarnings.AddRange(warnings);
-
+
#region Return result
if (addToCartWarnings.Any())
@@ -773,7 +772,7 @@ namespace Grand.Web.Controllers
model = model,
});
}
-
+
[HttpPost]
public virtual async Task<IActionResult> UpdateItemCart(string shoppingCartItemId, IFormCollection form)
{
diff --git a/src/Web/Grand.Web/Controllers/BlogController.cs b/src/Web/Grand.Web/Controllers/BlogController.cs
index 0df508772..dd875b6ed 100644
--- a/src/Web/Grand.Web/Controllers/BlogController.cs
+++ b/src/Web/Grand.Web/Controllers/BlogController.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.Blogs;
using Grand.Infrastructure;
using Grand.Web.Commands.Models.Blogs;
diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.cs
index ddeeb74d1..d286628be 100644
--- a/src/Web/Grand.Web/Controllers/CatalogController.cs
+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs
@@ -1,16 +1,16 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Events;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Events.Customers;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Controllers/CheckoutController.cs b/src/Web/Grand.Web/Controllers/CheckoutController.cs
index 4653b6e85..c3fbd3350 100644
--- a/src/Web/Grand.Web/Controllers/CheckoutController.cs
+++ b/src/Web/Grand.Web/Controllers/CheckoutController.cs
@@ -1,17 +1,15 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
@@ -28,6 +26,7 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Web.Controllers
{
@@ -145,8 +144,7 @@ namespace Grand.Web.Controllers
filterByCountryId = _workContext.CurrentCustomer.BillingAddress.CountryId;
}
- var paymentMethodModel = await _mediator.Send(new GetPaymentMethod()
- {
+ var paymentMethodModel = await _mediator.Send(new GetPaymentMethod() {
Cart = cart,
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
@@ -172,24 +170,19 @@ namespace Grand.Web.Controllers
return errors;
}
- protected virtual bool IsRequestBeingRedirected
- {
- get
- {
+ protected virtual bool IsRequestBeingRedirected {
+ get {
var response = HttpContext.Response;
return new List<int> { 301, 302 }.Contains(response.StatusCode);
}
}
- protected virtual bool IsPostBeingDone
- {
- get
- {
+ protected virtual bool IsPostBeingDone {
+ get {
if (HttpContext.Items["grand.IsPOSTBeingDone"] == null)
return false;
return Convert.ToBoolean(HttpContext.Items["grand.IsPOSTBeingDone"]);
}
- set
- {
+ set {
HttpContext.Items["grand.IsPOSTBeingDone"] = value;
}
}
@@ -212,7 +205,7 @@ namespace Grand.Web.Controllers
await _customerService.ResetCheckoutData(customer, _workContext.CurrentStore.Id);
//validation (cart)
- var checkoutAttributes = await customer.GetUserField<List<CustomAttribute>>(_userFieldService, SystemCustomerFieldNames.CheckoutAttributes,
+ var checkoutAttributes = await customer.GetUserField<List<CustomAttribute>>(_userFieldService, SystemCustomerFieldNames.CheckoutAttributes,
_workContext.CurrentStore.Id);
var scWarnings = await _shoppingCartValidator.GetShoppingCartWarnings(cart, checkoutAttributes, true);
if (scWarnings.Any())
@@ -259,8 +252,7 @@ namespace Grand.Web.Controllers
}
//model
- var model = new CheckoutCompletedModel
- {
+ var model = new CheckoutCompletedModel {
OrderId = order.Id,
OrderNumber = order.OrderNumber,
OrderCode = order.Code,
@@ -281,8 +273,7 @@ namespace Grand.Web.Controllers
[NonAction]
protected async Task<JsonResult> LoadStepAfterBillingAddress(IList<ShoppingCartItem> cart)
{
- var shippingMethodModel = await _mediator.Send(new GetShippingMethod()
- {
+ var shippingMethodModel = await _mediator.Send(new GetShippingMethod() {
Cart = cart,
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
@@ -309,8 +300,7 @@ namespace Grand.Web.Controllers
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "shipping-method",
model = shippingMethodModel
},
@@ -336,8 +326,7 @@ namespace Grand.Web.Controllers
}
//payment is required
- var paymentMethodModel = await _mediator.Send(new GetPaymentMethod()
- {
+ var paymentMethodModel = await _mediator.Send(new GetPaymentMethod() {
Cart = cart,
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
@@ -369,8 +358,7 @@ namespace Grand.Web.Controllers
//customer have to choose a payment method
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "payment-method",
model = paymentMethodModel
},
@@ -385,8 +373,7 @@ namespace Grand.Web.Controllers
var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer });
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
},
@@ -413,8 +400,7 @@ namespace Grand.Web.Controllers
var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer });
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
},
@@ -426,8 +412,7 @@ namespace Grand.Web.Controllers
var paymenInfoModel = await _mediator.Send(new GetPaymentInfo() { PaymentMethod = paymentMethod });
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "payment-info",
model = paymenInfoModel
},
@@ -456,11 +441,9 @@ namespace Grand.Web.Controllers
}
var paymentMethodModel = await GetCheckoutPaymentMethodModel(cart);
var requiresShipping = cart.RequiresShipping();
- var model = new CheckoutModel
- {
+ var model = new CheckoutModel {
ShippingRequired = requiresShipping,
- BillingAddress = await _mediator.Send(new GetBillingAddress()
- {
+ BillingAddress = await _mediator.Send(new GetBillingAddress() {
Cart = cart,
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
@@ -468,8 +451,7 @@ namespace Grand.Web.Controllers
Store = _workContext.CurrentStore,
PrePopulateNewAddressWithCustomerFields = true
}),
- ShippingAddress = await _mediator.Send(new GetShippingAddress()
- {
+ ShippingAddress = await _mediator.Send(new GetShippingAddress() {
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
Language = _workContext.WorkingLanguage,
@@ -522,8 +504,7 @@ namespace Grand.Web.Controllers
if (!ModelState.IsValid)
{
//model is not valid. redisplay the form with errors
- var billingAddressModel = await _mediator.Send(new GetBillingAddress()
- {
+ var billingAddressModel = await _mediator.Send(new GetBillingAddress() {
Cart = cart,
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
@@ -536,8 +517,7 @@ namespace Grand.Web.Controllers
billingAddressModel.NewAddressPreselected = true;
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "billing",
model = billingAddressModel
},
@@ -556,9 +536,9 @@ namespace Grand.Web.Controllers
if (address == null)
{
//address is not found. create a new one
- address =
+ address =
await _groupService.IsGuest(_workContext.CurrentCustomer) ?
- model.NewAddress.ToEntity() :
+ model.NewAddress.ToEntity() :
model.NewAddress.ToEntity(_workContext.CurrentCustomer, addressSettings);
address.Attributes = customAttributes;
@@ -628,8 +608,7 @@ namespace Grand.Web.Controllers
throw new Exception("Pickup point is not allowed");
//save "pick up in store" shipping method
- var pickUpInStoreShippingOption = new ShippingOption
- {
+ var pickUpInStoreShippingOption = new ShippingOption {
Name = string.Format(_translationService.GetResource("Checkout.PickupPoints.Name"), selectedPoint.Name),
Rate = selectedPoint.PickupFee,
Description = selectedPoint.Description,
@@ -679,12 +658,11 @@ namespace Grand.Web.Controllers
{
ModelState.AddModelError("", error);
}
-
+
if (!ModelState.IsValid)
- {
+ {
//model is not valid. redisplay the form with errors
- var shippingAddressModel = await _mediator.Send(new GetShippingAddress()
- {
+ var shippingAddressModel = await _mediator.Send(new GetShippingAddress() {
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
Language = _workContext.WorkingLanguage,
@@ -696,8 +674,7 @@ namespace Grand.Web.Controllers
shippingAddressModel.NewAddressPreselected = true;
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "shipping",
model = shippingAddressModel
},
@@ -732,7 +709,7 @@ namespace Grand.Web.Controllers
}
}
- if (model.BillToTheSameAddress && !pickupInstore &&
+ if (model.BillToTheSameAddress && !pickupInstore &&
(_workContext.CurrentCustomer.ShippingAddress.AddressType != AddressType.Shipping))
{
_workContext.CurrentCustomer.BillingAddress = _workContext.CurrentCustomer.ShippingAddress;
@@ -742,8 +719,7 @@ namespace Grand.Web.Controllers
}
else
{
- var billingAddressModel = await _mediator.Send(new GetBillingAddress()
- {
+ var billingAddressModel = await _mediator.Send(new GetBillingAddress() {
Cart = cart,
Currency = _workContext.WorkingCurrency,
Customer = _workContext.CurrentCustomer,
@@ -756,8 +732,7 @@ namespace Grand.Web.Controllers
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "billing",
model = billingAddressModel
},
@@ -794,7 +769,7 @@ namespace Grand.Web.Controllers
var splittedOption = shippingoption.Split(new[] { "___" }, StringSplitOptions.RemoveEmptyEntries);
if (splittedOption.Length != 2)
throw new Exception("Selected shipping method can't be parsed");
-
+
var selectedName = splittedOption[0];
var shippingRateProviderSystemName = splittedOption[1];
@@ -882,8 +857,7 @@ namespace Grand.Web.Controllers
var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer });
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
},
@@ -952,8 +926,7 @@ namespace Grand.Web.Controllers
var confirmOrderModel = await _mediator.Send(new GetConfirmOrder() { Cart = cart, Customer = _workContext.CurrentCustomer });
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
},
@@ -965,8 +938,7 @@ namespace Grand.Web.Controllers
var paymenInfoModel = await _mediator.Send(new GetPaymentInfo() { PaymentMethod = paymentMethod });
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "payment-info",
model = paymenInfoModel
}
@@ -988,8 +960,7 @@ namespace Grand.Web.Controllers
await CartValidate(cart);
//prevent 2 orders being placed within an X seconds time frame
- if (!await _mediator.Send(new GetMinOrderPlaceIntervalValid()
- {
+ if (!await _mediator.Send(new GetMinOrderPlaceIntervalValid() {
Customer = _workContext.CurrentCustomer,
Store = _workContext.CurrentStore
}))
@@ -1031,8 +1002,7 @@ namespace Grand.Web.Controllers
return Json(new
{
- update_section = new UpdateSectionJsonModel
- {
+ update_section = new UpdateSectionJsonModel {
name = "confirm-order",
model = confirmOrderModel
},
diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.cs
index cda7cd6da..921186ebe 100644
--- a/src/Web/Grand.Web/Controllers/CommonController.cs
+++ b/src/Web/Grand.Web/Controllers/CommonController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Stores;
-using Grand.Business.Marketing.Interfaces.Contacts;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Stores;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Captcha;
using Grand.Web.Common.Themes;
diff --git a/src/Web/Grand.Web/Controllers/CountryController.cs b/src/Web/Grand.Web/Controllers/CountryController.cs
index e8cf19625..829510b81 100644
--- a/src/Web/Grand.Web/Controllers/CountryController.cs
+++ b/src/Web/Grand.Web/Controllers/CountryController.cs
@@ -1,5 +1,5 @@
using Grand.Web.Common.Filters;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Common;
using Grand.Web.Features.Models.Common;
using MediatR;
diff --git a/src/Web/Grand.Web/Controllers/CourseController.cs b/src/Web/Grand.Web/Controllers/CourseController.cs
index 3a1304325..017b563cd 100644
--- a/src/Web/Grand.Web/Controllers/CourseController.cs
+++ b/src/Web/Grand.Web/Controllers/CourseController.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Marketing.Interfaces.Courses;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Courses;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Controllers/DownloadController.cs b/src/Web/Grand.Web/Controllers/DownloadController.cs
index dcea253d5..40372c5ac 100644
--- a/src/Web/Grand.Web/Controllers/DownloadController.cs
+++ b/src/Web/Grand.Web/Controllers/DownloadController.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Documents;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index c7d907383..0f08d0835 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.System.Commands.Models.Security;
-using Grand.Business.System.Interfaces.Installation;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Commands.System.Security;
+using Grand.Business.Core.Interfaces.System.Installation;
using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Configuration;
@@ -264,13 +264,8 @@ namespace Grand.Web.Controllers
}
//register default permissions
- var permissionProviders = new List<Type>();
- permissionProviders.Add(typeof(PermissionProvider));
- foreach (var providerType in permissionProviders)
- {
- var provider = (IPermissionProvider)Activator.CreateInstance(providerType);
- await _mediator.Send(new InstallPermissionsCommand() { PermissionProvider = provider });
- }
+ var permissionProvider = _serviceProvider.GetRequiredService<IPermissionProvider>();
+ await _mediator.Send(new InstallPermissionsCommand() { PermissionProvider = permissionProvider });
//install migration process - install only header
var migrationProcess = _serviceProvider.GetRequiredService<IMigrationProcess>();
diff --git a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs
index 9be31f657..ee46bb549 100644
--- a/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs
+++ b/src/Web/Grand.Web/Controllers/KnowledgebaseController.cs
@@ -1,13 +1,12 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Extensions;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Domain.Knowledgebase;
using Grand.Domain.Localization;
diff --git a/src/Web/Grand.Web/Controllers/LetsEncryptController.cs b/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
index 3e47e8cf8..c6251c872 100644
--- a/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
+++ b/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Common;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
index bd56b5b23..72caa1e32 100644
--- a/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
+++ b/src/Web/Grand.Web/Controllers/MerchandiseReturnController.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Common;
using Grand.Domain.Orders;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Controllers/NewsController.cs b/src/Web/Grand.Web/Controllers/NewsController.cs
index 65f889306..b02ea8e10 100644
--- a/src/Web/Grand.Web/Controllers/NewsController.cs
+++ b/src/Web/Grand.Web/Controllers/NewsController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Domain.News;
using Grand.Infrastructure;
using Grand.Web.Commands.Models.News;
diff --git a/src/Web/Grand.Web/Controllers/OrderController.cs b/src/Web/Grand.Web/Controllers/OrderController.cs
index 5d899729a..a4e9249c6 100644
--- a/src/Web/Grand.Web/Controllers/OrderController.cs
+++ b/src/Web/Grand.Web/Controllers/OrderController.cs
@@ -1,10 +1,10 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Pdf;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Pdf;
using Grand.Domain.Orders;
using Grand.Domain.Shipping;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
index 68c203f9f..accbeda49 100644
--- a/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
+++ b/src/Web/Grand.Web/Controllers/OutOfStockSubscriptionController.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Controllers/PageController.cs b/src/Web/Grand.Web/Controllers/PageController.cs
index d3f5735ab..b140a3063 100644
--- a/src/Web/Grand.Web/Controllers/PageController.cs
+++ b/src/Web/Grand.Web/Controllers/PageController.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
using Grand.Infrastructure;
using Grand.Web.Common.Filters;
using Grand.Web.Features.Models.Pages;
diff --git a/src/Web/Grand.Web/Controllers/PixelController.cs b/src/Web/Grand.Web/Controllers/PixelController.cs
index 6439a0687..5c58b6588 100644
--- a/src/Web/Grand.Web/Controllers/PixelController.cs
+++ b/src/Web/Grand.Web/Controllers/PixelController.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Infrastructure;
using Grand.Web.Common.Controllers;
using Microsoft.AspNetCore.Authorization;
diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.cs
index 6fd3df0f2..93d682389 100644
--- a/src/Web/Grand.Web/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web/Controllers/ProductController.cs
@@ -1,21 +1,19 @@
-using Grand.Business.Catalog.Events.Models;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Marketing.Interfaces.Customers;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Events.Catalog;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Marketing.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Orders;
using Grand.Infrastructure;
-using Grand.Infrastructure.Caching.Constants;
using Grand.Web.Commands.Models.Products;
using Grand.Web.Common.Filters;
using Grand.Web.Common.Security.Captcha;
@@ -486,8 +484,8 @@ namespace Grand.Web.Controllers
[ValidateCaptcha]
[DenySystemAccount]
public virtual async Task<IActionResult> ProductReviews(
- string productId,
- ProductReviewsModel model,
+ string productId,
+ ProductReviewsModel model,
bool captchaValid,
[FromServices] IGroupService groupService,
[FromServices] IOrderService orderService,
@@ -514,10 +512,10 @@ namespace Grand.Web.Controllers
if (_catalogSettings.ProductReviewPossibleOnlyOnce)
{
- var reviews = await productReviewService.GetAllProductReviews(customerId: _workContext.CurrentCustomer.Id,
+ var reviews = await productReviewService.GetAllProductReviews(customerId: _workContext.CurrentCustomer.Id,
productId: productId,
pageSize: 1);
- if(reviews.Any())
+ if (reviews.Any())
ModelState.AddModelError(string.Empty, _translationService.GetResource("Reviews.ProductReviewPossibleOnlyOnce"));
}
diff --git a/src/Web/Grand.Web/Controllers/PushNotificationsController.cs b/src/Web/Grand.Web/Controllers/PushNotificationsController.cs
index 99a935242..3b740c5d8 100644
--- a/src/Web/Grand.Web/Controllers/PushNotificationsController.cs
+++ b/src/Web/Grand.Web/Controllers/PushNotificationsController.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Marketing.Interfaces.PushNotifications;
+using Grand.Business.Core.Interfaces.Marketing.PushNotifications;
using Grand.Domain.PushNotifications;
using Grand.Infrastructure;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
index decf91b1a..69815cf37 100644
--- a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
+++ b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
@@ -1,16 +1,15 @@
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.cs
index 080d11835..137630389 100644
--- a/src/Web/Grand.Web/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web/Controllers/VendorController.cs
@@ -1,11 +1,10 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Seo;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
-using Grand.Business.Storage.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Seo;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Common;
using Grand.Domain.Localization;
using Grand.Domain.Seo;
diff --git a/src/Web/Grand.Web/Controllers/WishlistController.cs b/src/Web/Grand.Web/Controllers/WishlistController.cs
index af7546482..cd0ad7ce9 100644
--- a/src/Web/Grand.Web/Controllers/WishlistController.cs
+++ b/src/Web/Grand.Web/Controllers/WishlistController.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
using Grand.Infrastructure;
@@ -17,6 +16,7 @@ using Grand.Web.Features.Models.ShoppingCart;
using Grand.Web.Models.ShoppingCart;
using MediatR;
using Microsoft.AspNetCore.Mvc;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Web.Controllers
{
@@ -216,7 +216,7 @@ namespace Grand.Web.Controllers
return Json(new { success = true, message = "" });
}
-
+
[HttpPost]
[AutoValidateAntiforgeryToken]
[ValidateCaptcha]
@@ -230,7 +230,7 @@ namespace Grand.Web.Controllers
var cart = await _shoppingCartService.GetShoppingCart(_workContext.CurrentStore.Id, ShoppingCartType.Wishlist);
if (!cart.Any())
- return Content("");
+ return Content("");
//validate CAPTCHA
if (captchaSettings.Enabled && captchaSettings.ShowOnEmailWishlistToFriendPage && !captchaValid)
diff --git a/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs b/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs
index 52f1a78f2..a2f6402a4 100644
--- a/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs
+++ b/src/Web/Grand.Web/Events/CustomerLoggedInEventHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Events;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Events.Customers;
using MediatR;
using Microsoft.AspNetCore.Http;
diff --git a/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs b/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs
index efce55203..e7b9b6e04 100644
--- a/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs
+++ b/src/Web/Grand.Web/Events/CustomerLoggedOutEventHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Business.Customers.Events;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Logging;
+using Grand.Business.Core.Events.Customers;
using MediatR;
using Microsoft.AspNetCore.Http;
diff --git a/src/Web/Grand.Web/Extensions/MappingExtensions.cs b/src/Web/Grand.Web/Extensions/MappingExtensions.cs
index 8083da726..e5ebd9f81 100644
--- a/src/Web/Grand.Web/Extensions/MappingExtensions.cs
+++ b/src/Web/Grand.Web/Extensions/MappingExtensions.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Courses;
diff --git a/src/Web/Grand.Web/Extensions/OrderExtensions.cs b/src/Web/Grand.Web/Extensions/OrderExtensions.cs
index cc077250f..3e397a730 100644
--- a/src/Web/Grand.Web/Extensions/OrderExtensions.cs
+++ b/src/Web/Grand.Web/Extensions/OrderExtensions.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
index 307178814..4619a7de0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostCategoryHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Web.Features.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
index db89236c4..967be56a5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure;
using Grand.Domain.Blogs;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
index 7d0a002bf..0dcd3d64e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostListHandler.cs
@@ -2,15 +2,15 @@
using Grand.Domain;
using Grand.Domain.Blogs;
using Grand.Domain.Media;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Models.Blogs;
using Grand.Web.Models.Media;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Blogs
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
index ed0a8684f..3f2cef552 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostTagListHandler.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Domain.Blogs;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
index 19df56aef..0ebbed44e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetBlogPostYearHandler.cs
@@ -1,11 +1,11 @@
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Features.Models.Blogs;
using Grand.Web.Events.Cache;
using Grand.Web.Models.Blogs;
using MediatR;
-using Grand.Business.Cms.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Blogs
{
@@ -15,7 +15,7 @@ namespace Grand.Web.Features.Handlers.Blogs
private readonly ICacheBase _cacheBase;
private readonly IWorkContext _workContext;
- public GetBlogPostYearHandler(IBlogService blogService, ICacheBase cacheBase,
+ public GetBlogPostYearHandler(IBlogService blogService, ICacheBase cacheBase,
IWorkContext workContext)
{
_blogService = blogService;
diff --git a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
index 9fd26a396..cf00103c7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Blogs/GetHomePageBlogHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Domain.Blogs;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
index 2c58e7558..384512cda 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandAllHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Customers;
using Grand.Domain.Media;
using Grand.Infrastructure.Caching;
@@ -10,7 +10,7 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
index 57c7cac53..252977477 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandHandler.cs
@@ -1,7 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Handlers;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Catalog;
-using Grand.Infrastructure.Caching;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
@@ -40,8 +39,7 @@ namespace Grand.Web.Features.Handlers.Catalog
request.Command.OrderBy = request.Brand.DefaultSort;
//view/sorting/page size
- var options = await _mediator.Send(new GetViewSortSizeOptions()
- {
+ var options = await _mediator.Send(new GetViewSortSizeOptions() {
Command = request.Command,
PagingFilteringModel = request.Command,
Language = request.Language,
@@ -54,8 +52,7 @@ namespace Grand.Web.Features.Handlers.Catalog
IList<string> alreadyFilteredSpecOptionIds = await model.PagingFilteringContext.SpecificationFilter.GetAlreadyFilteredSpecOptionIds
(_httpContextAccessor.HttpContext.Request.Query, _specificationAttributeService);
- var products = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ var products = (await _mediator.Send(new GetSearchProductsQuery() {
LoadFilterableSpecificationAttributeOptionIds = !_catalogSettings.IgnoreFilterableSpecAttributeOption,
BrandId = request.Brand.Id,
Customer = request.Customer,
@@ -68,8 +65,7 @@ namespace Grand.Web.Features.Handlers.Catalog
PageSize = request.Command.PageSize
}));
- model.Products = (await _mediator.Send(new GetProductOverview()
- {
+ model.Products = (await _mediator.Send(new GetProductOverview() {
Products = products.products,
PrepareSpecificationAttributes = _catalogSettings.ShowSpecAttributeOnCatalogPages
})).ToList();
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
index d76903f2f..88dd6a1c6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetBrandLayoutViewPathHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
using Grand.Web.Features.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
index 38042fe0c..f9dfbd4b9 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryFeaturedProductsHandler.cs
@@ -1,7 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Caching;
using Grand.Domain;
using Grand.Domain.Catalog;
@@ -14,7 +13,8 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Features.Handlers.Catalog
{
@@ -60,8 +60,7 @@ namespace Grand.Web.Features.Handlers.Catalog
var catModel = x.ToModel(request.Language);
//prepare picture model
var picture = !string.IsNullOrEmpty(x.PictureId) ? await _pictureService.GetPictureById(x.PictureId) : null;
- catModel.PictureModel = new PictureModel
- {
+ catModel.PictureModel = new PictureModel {
Id = x.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),
@@ -92,8 +91,7 @@ namespace Grand.Web.Features.Handlers.Catalog
var hasFeaturedProductsCache = await _cacheBase.GetAsync<bool?>(cacheKey, async () =>
{
- featuredProducts = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ featuredProducts = (await _mediator.Send(new GetSearchProductsQuery() {
PageSize = _catalogSettings.LimitOfFeaturedProducts,
CategoryIds = new List<string> { item.Id },
Customer = request.Customer,
@@ -107,8 +105,7 @@ namespace Grand.Web.Features.Handlers.Catalog
if (hasFeaturedProductsCache.Value && featuredProducts == null)
{
//cache indicates that the category has featured products
- featuredProducts = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ featuredProducts = (await _mediator.Send(new GetSearchProductsQuery() {
PageSize = _catalogSettings.LimitOfFeaturedProducts,
CategoryIds = new List<string> { item.Id },
Customer = request.Customer,
@@ -119,8 +116,7 @@ namespace Grand.Web.Features.Handlers.Catalog
}
if (featuredProducts != null && featuredProducts.Any())
{
- item.FeaturedProducts = (await _mediator.Send(new GetProductOverview()
- {
+ item.FeaturedProducts = (await _mediator.Send(new GetProductOverview() {
PrepareSpecificationAttributes = _catalogSettings.ShowSpecAttributeOnCatalogPages,
Products = featuredProducts,
})).ToList();
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
index 4861291d6..464dcdfea 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryHandler.cs
@@ -1,9 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
@@ -18,6 +17,7 @@ using Grand.Web.Models.Media;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
index f28c55059..047bb459c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryLayoutViewPathHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Web.Features.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
index 0210958a5..854408fb1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategoryNavigationHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
index 110646c3e..8e86d3551 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCategorySimpleHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Caching;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
index 6a4bfd986..514cb57b7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetChildCategoryIdsHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
using Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
index 7f666f8cd..21de334db 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionAllHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Caching;
using Grand.Domain.Customers;
using Grand.Domain.Media;
@@ -10,7 +10,7 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
index baf2fc159..25f9b378f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionFeaturedProductsHandler.cs
@@ -1,7 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Caching;
using Grand.Domain;
using Grand.Domain.Catalog;
@@ -14,7 +13,8 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Features.Handlers.Catalog
{
@@ -61,8 +61,7 @@ namespace Grand.Web.Features.Handlers.Catalog
var colModel = x.ToModel(request.Language);
//prepare picture model
var picture = !string.IsNullOrEmpty(x.PictureId) ? await _pictureService.GetPictureById(x.PictureId) : null;
- colModel.PictureModel = new PictureModel
- {
+ colModel.PictureModel = new PictureModel {
Id = x.PictureId,
FullSizeImageUrl = await _pictureService.GetPictureUrl(x.PictureId),
ImageUrl = await _pictureService.GetPictureUrl(x.PictureId, _mediaSettings.CategoryThumbPictureSize),
@@ -95,8 +94,7 @@ namespace Grand.Web.Features.Handlers.Catalog
var hasFeaturedProductsCache = await _cacheBase.GetAsync<bool?>(cacheKey, async () =>
{
- featuredProducts = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ featuredProducts = (await _mediator.Send(new GetSearchProductsQuery() {
PageSize = _catalogSettings.LimitOfFeaturedProducts,
CollectionId = item.Id,
Customer = request.Customer,
@@ -110,8 +108,7 @@ namespace Grand.Web.Features.Handlers.Catalog
if (hasFeaturedProductsCache.Value && featuredProducts == null)
{
//cache indicates that the collection has featured products
- featuredProducts = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ featuredProducts = (await _mediator.Send(new GetSearchProductsQuery() {
PageSize = _catalogSettings.LimitOfFeaturedProducts,
Customer = request.Customer,
CollectionId = item.Id,
@@ -122,8 +119,7 @@ namespace Grand.Web.Features.Handlers.Catalog
}
if (featuredProducts != null && featuredProducts.Any())
{
- item.FeaturedProducts = (await _mediator.Send(new GetProductOverview()
- {
+ item.FeaturedProducts = (await _mediator.Send(new GetProductOverview() {
Products = featuredProducts,
})).ToList();
}
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
index dce84b3ae..0f252ac51 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Handlers;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
index 9bfc0704a..bf3efe801 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionLayoutViewPathHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
using Grand.Web.Features.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
index 21ad1f0a1..5339b9565 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCollectionNavigationHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Extensions;
using Grand.Infrastructure.Caching;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs
index 061bd890e..6e6218344 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetCompareProductsHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Catalog;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching.Constants;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
index 685ad4914..ef8805cb1 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetFormatBasePriceHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Features.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
index 5e3cec501..8991c91ca 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageBrandsHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Media;
using Grand.Infrastructure.Caching;
using Grand.Web.Extensions;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
index 4257550d8..0be4b9255 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCategoryHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Customers;
using Grand.Domain.Media;
using Grand.Infrastructure.Caching;
@@ -10,7 +10,7 @@ using Grand.Web.Events.Cache;
using Grand.Web.Models.Catalog;
using Grand.Web.Models.Media;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
index b071fe0c0..ca80cacc7 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetHomepageCollectionsHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure.Caching;
using Grand.Domain.Media;
using Grand.Web.Extensions;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
index 010876c08..7f25bed74 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetMenuHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
index 8281338a0..cd351ff96 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetPopularProductTagsHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
using Grand.Infrastructure.Caching;
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
index 7c005f454..38cf20881 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductAttributeHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
index f60002684..3d5dfe298 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductTagsAllHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
index 1b9c37012..8da29a118 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetProductsByTagHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
@@ -23,16 +23,14 @@ namespace Grand.Web.Features.Handlers.Catalog
public async Task<ProductsByTagModel> Handle(GetProductsByTag request, CancellationToken cancellationToken)
{
- var model = new ProductsByTagModel
- {
+ var model = new ProductsByTagModel {
Id = request.ProductTag.Id,
TagName = request.ProductTag.GetTranslation(y => y.Name, request.Language.Id),
TagSeName = request.ProductTag.GetSeName(request.Language.Id)
};
//view/sorting/page size
- var options = await _mediator.Send(new GetViewSortSizeOptions()
- {
+ var options = await _mediator.Send(new GetViewSortSizeOptions() {
Command = request.Command,
PagingFilteringModel = request.Command,
Language = request.Language,
@@ -43,8 +41,7 @@ namespace Grand.Web.Features.Handlers.Catalog
model.PagingFilteringContext = options.command;
//products
- var products = (await _mediator.Send(new GetSearchProductsQuery()
- {
+ var products = (await _mediator.Send(new GetSearchProductsQuery() {
Customer = request.Customer,
StoreId = request.Store.Id,
ProductTag = request.ProductTag.Name,
@@ -54,8 +51,7 @@ namespace Grand.Web.Features.Handlers.Catalog
PageSize = request.Command.PageSize
})).products;
- model.Products = (await _mediator.Send(new GetProductOverview()
- {
+ model.Products = (await _mediator.Send(new GetProductOverview() {
Products = products,
PrepareSpecificationAttributes = _catalogSettings.ShowSpecAttributeOnCatalogPages
})).ToList();
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
index da86bb9b4..de4cb0788 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
@@ -1,14 +1,13 @@
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Blogs;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
@@ -19,6 +18,7 @@ using Grand.Web.Features.Models.Catalog;
using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
index 7e63550c5..c864913b0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchBoxHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Infrastructure.Caching;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
index 3be796ed8..bd8ea74fc 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchHandler.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Directory;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
@@ -21,6 +20,7 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Mvc.Rendering;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
index 5bc9f562e..1b0806f70 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorAllHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Media;
using Grand.Domain.Vendors;
using Grand.Infrastructure.Caching;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
index 9f80003e7..817f263f9 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorHandler.cs
@@ -1,8 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Queries.Handlers;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Vendors;
@@ -16,6 +15,7 @@ using Grand.Web.Models.Media;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
+using Grand.Business.Core.Queries.Catalog;
namespace Grand.Web.Features.Handlers.Catalog
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
index 83dfd6a4a..be14e6e3e 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetVendorNavigationHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Vendors;
using Grand.Infrastructure.Caching;
using Grand.Web.Features.Models.Catalog;
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
index 5b6421fec..cda971f17 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetViewSortSizeOptionsHandler.cs
@@ -1,10 +1,10 @@
using Grand.Domain.Catalog;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Features.Models.Catalog;
using Grand.Web.Models.Catalog;
using MediatR;
using Microsoft.AspNetCore.Mvc.Rendering;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Grand.Infrastructure.Extensions;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
index 4ab595b35..b71824add 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetBillingAddressHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Common;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
index ddf143717..6a04aaedd 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetConfirmOrderHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Checkout;
using Grand.Web.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
index eb63b932c..38e1e6d90 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetIsPaymentWorkflowRequiredHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Payments;
using Grand.Web.Features.Models.Checkout;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
index c2d7bf71f..8059ab09a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetMinOrderPlaceIntervalValidHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Checkout;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
index 369ebb2c6..8fc2cfd43 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetPaymentMethodHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Enum;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Enums.Checkout;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
index 9ba229e04..f0c0a2980 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingAddressHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.Checkout;
diff --git a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
index 3df51b71a..c94b02c3d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Checkout/GetShippingMethodHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Shipping;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
index e46b5a3b6..c07c5a4c0 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetAddressModelHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Addresses;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Addresses;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
index 5ad6defba..b5fcb9186 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetParseCustomAddressAttributesHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Addresses;
+using Grand.Business.Core.Interfaces.Common.Addresses;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
index cbcef9d15..4ee2cf403 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetPrivacyPreferenceModelHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
index 959667b10..1cc46f0bf 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetRobotsTextFileHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Features.Models.Common;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
index 02155c5e2..45b1695d6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetSitemapHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Marketing.Interfaces.Knowledgebase;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Marketing.Knowledgebase;
using Grand.Infrastructure.Caching;
using Grand.Domain.Blogs;
using Grand.Domain.Common;
@@ -18,7 +18,7 @@ using Grand.Web.Models.Common;
using Grand.Web.Models.Knowledgebase;
using Grand.Web.Models.Pages;
using MediatR;
-using Grand.Business.Catalog.Interfaces.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
index f98965ce6..2f25f58ac 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetStatesProvinceHandler.cs
@@ -1,10 +1,10 @@
using Grand.Infrastructure;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Common;
using Grand.Web.Features.Models.Common;
using MediatR;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Common
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
index 5b2e4422c..1cd3b359d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Common/GetVendorAddressHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Directory;
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
index ff2303829..426ba607f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetCheckOrderHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Web.Features.Models.Courses;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
index 439c2cc09..0dc4c3375 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetCourseHandler.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Media;
-using Grand.Business.Marketing.Interfaces.Courses;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Courses;
using Grand.Web.Models.Course;
diff --git a/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs b/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
index 13098b766..9faa8b34a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Courses/GetLessonHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Marketing.Interfaces.Courses;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Courses;
using Grand.Web.Models.Course;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
index 94c050e3a..050694ac6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAddressListHandler.cs
@@ -1,10 +1,10 @@
using Grand.Domain.Common;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Features.Models.Common;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Common.Security;
namespace Grand.Web.Features.Handlers.Customers
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
index fd576f776..3c3928101 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetAuctionsHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
index c36407a91..40cd74f0f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCoursesHandler.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Courses;
using Grand.Domain.Customers;
-using Grand.Business.Marketing.Interfaces.Courses;
+using Grand.Business.Core.Interfaces.Marketing.Courses;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
index 93e808eb8..92087e25a 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetCustomAttributesHandler.cs
@@ -1,6 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Customers.Extensions;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
index 1d47f93c7..9b6ead528 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDocumentsHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Documents;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Documents;
using Grand.Domain.Documents;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
index 1e13a4021..b7cfb1505 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetDownloadableProductsHandler.cs
@@ -1,8 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
index 91f7e0fd6..1c9c7d83d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetInfoHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Tax;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
index 9b926d1f6..7e80b2448 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetNotesHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
index 8f2b0e66e..7ed96d671 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetParseCustomAttributesHandler.cs
@@ -1,6 +1,6 @@
using Grand.Domain.Catalog;
using Grand.Domain.Common;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Web.Features.Models.Customers;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
index 2a706f988..ed12cdb6b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetPasswordRecoveryConfirmHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
index b911ca438..36fde111c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetRegisterHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Marketing.Interfaces.Newsletters;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Marketing.Newsletters;
using Grand.Web.Common.Security.Captcha;
using Grand.Domain.Customers;
using Grand.Domain.Tax;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
index 101607a31..f93634d5f 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetReviewsHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
index 1e612aeb4..1274bcabd 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
index 443dae63c..92002cfe6 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetSubAccountsHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
index 1fdfd9b45..80610230c 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetTwoFactorAuthenticationHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Authentication.Interfaces;
-using Grand.Business.Messages.Interfaces;
+using Grand.Business.Core.Interfaces.Authentication;
+using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Customers;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
diff --git a/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs b/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
index 372b42b70..d6889fa57 100644
--- a/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Customers/GetUserAgreementHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Web.Features.Models.Customers;
using Grand.Web.Models.Customer;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs b/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs
index 447a07616..8731e709b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Messages/GetInteractiveFormHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Marketing.Interfaces.Contacts;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Marketing.Contacts;
using Grand.Infrastructure;
using Grand.Domain.Messages;
using Grand.Web.Features.Models.Messages;
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
index 4160a25fe..75cf528c8 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetHomePageNewsItemsHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Media;
using Grand.Domain.News;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
index 72664e475..fe15bd72d 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Web.Common.Security.Captcha;
using Grand.Domain.Customers;
using Grand.Domain.Media;
diff --git a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
index 0b6026ae7..ab1eb3fa6 100644
--- a/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/News/GetNewsItemListHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Media;
using Grand.Domain.News;
using Grand.Infrastructure;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
index 24637c05d..c44e73165 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerLoyaltyPointsHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
index c02d64f20..a79c3e09b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetCustomerOrderListHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Orders;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
index 499fa722f..df08ee398 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnDetailsHandler.cs
@@ -1,8 +1,8 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Infrastructure;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
index 06a1a517f..5055bfc41 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Common;
using Grand.Domain.Orders;
using Grand.Domain.Tax;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
index 666045157..07bd62270 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetMerchandiseReturnsHandler.cs
@@ -1,9 +1,9 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Tax;
using Grand.Web.Features.Models.Orders;
using Grand.Web.Models.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
index 66eb453ae..99a19e323 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetOrderDetailsHandler.cs
@@ -1,16 +1,14 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.GiftVouchers;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.GiftVouchers;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
index 1825d2be1..9c9248688 100644
--- a/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Orders/GetShipmentDetailsHandler.cs
@@ -1,9 +1,7 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Catalog;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.Common;
diff --git a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
index ce77200e8..f1b0867e5 100644
--- a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageBlockHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Cms.Interfaces;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Security;
+using Grand.Business.Core.Interfaces.Cms;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Security;
using Grand.Infrastructure;
using Grand.Web.Extensions;
using Grand.Web.Features.Models.Pages;
diff --git a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
index 08e62baf9..2f148675b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Pages/GetPageLayoutViewPathHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Cms.Interfaces;
+using Grand.Business.Core.Interfaces.Cms;
using Grand.Web.Features.Models.Pages;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
index 2eefd9e46..817623a8b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsAttributeChangeHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Media;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
index 1f7c907b4..3dfb23914 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
@@ -1,17 +1,16 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Categories;
-using Grand.Business.Catalog.Interfaces.Collections;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Categories;
+using Grand.Business.Core.Interfaces.Catalog.Collections;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure;
using Grand.Infrastructure.Caching;
using Grand.Domain.Catalog;
@@ -33,8 +32,8 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Globalization;
-using Grand.Business.Catalog.Interfaces.Brands;
-using Grand.Business.Catalog.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Brands;
+using Grand.Business.Core.Interfaces.Catalog.Directory;
namespace Grand.Web.Features.Handlers.Products
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
index 2e2801fa3..f494d0f8d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductLayoutViewPathHandler.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Interfaces.Products;
+using Grand.Business.Core.Interfaces.Catalog.Products;
using Grand.Web.Features.Models.Products;
using MediatR;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
index 2cdc54001..06e3debe4 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
@@ -1,13 +1,12 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Infrastructure;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
index 754081254..431462eb3 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductReviewsHandler.cs
@@ -1,7 +1,7 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Domain.Catalog;
using Grand.Domain.Customers;
using Grand.Web.Common.Security.Captcha;
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
index d20a66d15..f800ec96b 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductSpecificationHandler.cs
@@ -3,8 +3,8 @@ using Grand.Web.Features.Models.Products;
using Grand.Web.Models.Catalog;
using MediatR;
using System.Net;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
namespace Grand.Web.Features.Handlers.Products
{
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
index ba64ebfcd..67aa109fe 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetAddToCartHandler.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
index 9f5615363..310bbbd9d 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingHandler.cs
@@ -1,7 +1,6 @@
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Directory;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
index 99de366e5..c80080501 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetEstimateShippingResultHandler.cs
@@ -1,12 +1,12 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Common;
using Grand.Domain.Shipping;
using Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
index f5b7c3d62..be09afb8d 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniShoppingCartHandler.cs
@@ -1,16 +1,14 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Media;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs
index cac86c462..861a08424 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetMiniWishlistHandler.cs
@@ -1,10 +1,9 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Media;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
index c5572516e..0717ced10 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetOrderTotalsHandler.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Utilities;
-using Grand.Business.Common.Interfaces.Directory;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Utilities.Checkout;
+using Grand.Business.Core.Interfaces.Common.Directory;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Orders;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
index 953f10cdb..270579b28 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Web.Features.Models.ShoppingCart;
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
index 82385517e..e4936bc6b 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
@@ -1,24 +1,21 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Discounts;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Commands.Models.Orders;
-using Grand.Business.Checkout.Extensions;
-using Grand.Business.Checkout.Interfaces.CheckoutAttributes;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Interfaces.Payments;
-using Grand.Business.Checkout.Interfaces.Shipping;
-using Grand.Business.Checkout.Queries.Models.Orders;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Customers.Interfaces;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Discounts;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Commands.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Shipping;
+using Grand.Business.Core.Queries.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Customers;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -34,6 +31,7 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Routing;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
@@ -383,8 +381,8 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
//recurring info
if (product.IsRecurring)
- cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"),
- product.RecurringCycleLength,
+ cartItemModel.RecurringInfo = string.Format(_translationService.GetResource("ShoppingCart.RecurringPeriod"),
+ product.RecurringCycleLength,
product.RecurringCyclePeriodId.GetTranslationEnum(_translationService, request.Language.Id),
product.RecurringTotalCycles);
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
index fdf6b50ab..409b12b51 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetWishlistHandler.cs
@@ -1,15 +1,13 @@
-using Grand.Business.Catalog.Extensions;
-using Grand.Business.Catalog.Interfaces.Prices;
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Catalog.Interfaces.Tax;
-using Grand.Business.Catalog.Utilities;
-using Grand.Business.Checkout.Interfaces.Orders;
-using Grand.Business.Checkout.Services.Orders;
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Security;
-using Grand.Business.Common.Services.Security;
-using Grand.Business.Storage.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Prices;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Interfaces.Catalog.Tax;
+using Grand.Business.Core.Utilities.Catalog;
+using Grand.Business.Core.Interfaces.Checkout.Orders;
+using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Business.Core.Interfaces.Common.Security;
+using Grand.Business.Core.Utilities.Common.Security;
+using Grand.Business.Core.Interfaces.Storage;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
@@ -22,6 +20,7 @@ using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Routing;
+using Grand.Business.Core.Utilities.Checkout;
namespace Grand.Web.Features.Handlers.ShoppingCart
{
diff --git a/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs b/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
index 616fe6170..3d78d9a6d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Vendors/GetVendorReviewsHandler.cs
@@ -1,6 +1,6 @@
-using Grand.Business.Common.Extensions;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Customers.Interfaces;
+using Grand.Business.Core.Extensions;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Customers;
using Grand.Infrastructure;
using Grand.Domain.Customers;
using Grand.Domain.Vendors;
diff --git a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs
index 58e51b91f..602877e71 100644
--- a/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs
+++ b/src/Web/Grand.Web/Features/Models/Checkout/GetPaymentInfo.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Checkout.Interfaces.Payments;
+using Grand.Business.Core.Interfaces.Checkout.Payments;
using Grand.Web.Models.Checkout;
using MediatR;
diff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csproj
index 0d35a0fb7..12b224178 100644
--- a/src/Web/Grand.Web/Grand.Web.csproj
+++ b/src/Web/Grand.Web/Grand.Web.csproj
@@ -1,71 +1,75 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
- <Import Project="..\..\Build\Grand.Common.props" />
- <PropertyGroup>
- <ServerGarbageCollection>false</ServerGarbageCollection>
- <PreserveCompilationReferences>true</PreserveCompilationReferences>
- <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
- <UserSecretsId>a2091e37-94a0-4446-8a5d-1d5c0835333a</UserSecretsId>
- <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
- </PropertyGroup>
- <ItemGroup>
- <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" />
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <ServerGarbageCollection>false</ServerGarbageCollection>
+ <PreserveCompilationReferences>true</PreserveCompilationReferences>
+ <DockerComposeProjectPath>..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
+ <UserSecretsId>a2091e37-94a0-4446-8a5d-1d5c0835333a</UserSecretsId>
+ <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+ </PropertyGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
+ <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.Common\Grand.Web.Common.csproj" />
+ <ProjectReference Include="..\Grand.Web.Admin\Grand.Web.Admin.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>
- <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
- </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" />
- <Content Include="Roslyn\**" CopyToPublishDirectory="PreserveNewest" Exclude="Roslyn\**\*.dll" />
- <Content Include="logs\**" CopyToPublishDirectory="PreserveNewest" />
- <Content Remove="wwwroot\assets\images\thumbs\*.jpeg;wwwroot\assets\images\thumbs\*.jpg;wwwroot\assets\images\thumbs\*.png" />
- </ItemGroup>
- <Target Name="PublishViews" BeforeTargets="PrepareForPublish">
- <ItemGroup>
- <ThemeViews Include="Themes/**/*" />
- <PluginFiles Include="Plugins/**/*" />
- </ItemGroup>
- <Copy SourceFiles="@(ThemeViews)" DestinationFolder="$(PublishDir)/Themes/%(RecursiveDir)" SkipUnchangedFiles="true" />
- <Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(PublishDir)/Plugins/%(RecursiveDir)" SkipUnchangedFiles="true" />
- </Target>
- <!--<PropertyGroup>
+ <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>
+ <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
+ </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" />
+ <Content Include="Roslyn\**" CopyToPublishDirectory="PreserveNewest" Exclude="Roslyn\**\*.dll" />
+ <Content Include="logs\**" CopyToPublishDirectory="PreserveNewest" />
+ <Content Remove="wwwroot\assets\images\thumbs\*.jpeg;wwwroot\assets\images\thumbs\*.jpg;wwwroot\assets\images\thumbs\*.png" />
+ </ItemGroup>
+ <Target Name="PublishViews" BeforeTargets="PrepareForPublish">
+ <ItemGroup>
+ <ThemeViews Include="Themes/**/*" />
+ <PluginFiles Include="Plugins/**/*" />
+ </ItemGroup>
+ <Copy SourceFiles="@(ThemeViews)" DestinationFolder="$(PublishDir)/Themes/%(RecursiveDir)" SkipUnchangedFiles="true" />
+ <Copy SourceFiles="@(PluginFiles)" DestinationFolder="$(PublishDir)/Plugins/%(RecursiveDir)" SkipUnchangedFiles="true" />
+ </Target>
+ <!--<PropertyGroup>
<EnableDefaultContentItems>false</EnableDefaultContentItems>
</PropertyGroup>-->
- <ItemGroup>
- <Content Remove="Plugins\**" />
- <Compile Remove="Plugins\**" />
- <EmbeddedResource Remove="Plugins\**" />
- <None Remove="Plugins\**" />
- <Content Update="Plugins\**">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
- <ItemGroup>
- <None Update="Rotativa\Linux\wkhtmltopdf">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Rotativa\Mac\wkhtmltopdf">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Rotativa\Windows\wkhtmltopdf.exe">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <Content Remove="Plugins\**" />
+ <Compile Remove="Plugins\**" />
+ <EmbeddedResource Remove="Plugins\**" />
+ <None Remove="Plugins\**" />
+ <Content Update="Plugins\**">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+ <ItemGroup>
+ <None Update="Rotativa\Linux\wkhtmltopdf">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="Rotativa\Mac\wkhtmltopdf">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="Rotativa\Windows\wkhtmltopdf.exe">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
</Project>
diff --git a/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs b/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs
index b793125ed..7d64da94d 100644
--- a/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/CatalogPagingFilteringModel.cs
@@ -1,5 +1,5 @@
-using Grand.Business.Catalog.Interfaces.Products;
-using Grand.Business.Common.Extensions;
+using Grand.Business.Core.Interfaces.Catalog.Products;
+using Grand.Business.Core.Extensions;
using Grand.Domain.Catalog;
using Grand.Infrastructure.Extensions;
using Grand.Infrastructure.Models;
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs
index 1ebaebba9..ec643610f 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductDetailsModel.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
using Grand.Domain.Catalog;
diff --git a/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs b/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs
index 6be08b305..49ed50761 100644
--- a/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs
+++ b/src/Web/Grand.Web/Models/Catalog/ProductOverviewModel.cs
@@ -1,4 +1,4 @@
-using Grand.Business.Catalog.Utilities;
+using Grand.Business.Core.Utilities.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Tax;
using Grand.Infrastructure.Models;
diff --git a/src/Web/Grand.Web/Program.cs b/src/Web/Grand.Web/Program.cs
index 10226abaa..872cf4106 100644
--- a/src/Web/Grand.Web/Program.cs
+++ b/src/Web/Grand.Web/Program.cs
@@ -52,16 +52,16 @@ if (config.AllowNonAsciiCharInHeaders)
options.ResponseHeaderEncodingSelector = (_) => Encoding.UTF8;
});
}
-if(config.MaxRequestBodySize.HasValue)
+if (config.MaxRequestBodySize.HasValue)
{
builder.WebHost.ConfigureKestrel(host =>
{
- host.Limits.MaxRequestBodySize = config.MaxRequestBodySize.Value;
+ host.Limits.MaxRequestBodySize = config.MaxRequestBodySize.Value;
});
builder.Services.Configure<Microsoft.AspNetCore.Http.Features.FormOptions>(opt =>
{
- opt.MultipartBodyLengthLimit = config.MaxRequestBodySize.Value;
+ opt.MultipartBodyLengthLimit = config.MaxRequestBodySize.Value;
});
}
diff --git a/src/Web/Grand.Web/Roslyn/NotificationHandler.csx b/src/Web/Grand.Web/Roslyn/NotificationHandler.csx
index 711f01fb7..979daee47 100644
--- a/src/Web/Grand.Web/Roslyn/NotificationHandler.csx
+++ b/src/Web/Grand.Web/Roslyn/NotificationHandler.csx
@@ -3,7 +3,7 @@
#r "Grand.Business.Messages"
#r "Grand.Web"
-using Grand.Business.Messages.Events;
+using Grand.Business.Core.Events.Messages;
using Grand.Domain.Orders;
using MediatR;
using System.Threading;
diff --git a/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs b/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs
index 48e81b49f..ad17fde7e 100644
--- a/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs
+++ b/src/Web/Grand.Web/Validators/Blogs/BlogPostValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Blogs;
namespace Grand.Web.Validators.Blogs
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs
index 90c41eab3..591e661aa 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionSimpleValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Catalog;
namespace Grand.Web.Validators.Catalog
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs
index 17326946f..f113f70a8 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductAskQuestionValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Catalog;
namespace Grand.Web.Validators.Catalog
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs
index be156c964..c87f5ab27 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductEmailAFriendValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Catalog;
namespace Grand.Web.Validators.Catalog
diff --git a/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs b/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs
index 384804566..b7d41b078 100644
--- a/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Catalog/ProductReviewsValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Catalog;
namespace Grand.Web.Validators.Catalog
diff --git a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
index cf3fa6fb0..a06b47e41 100644
--- a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Common;
namespace Grand.Web.Validators.Common
diff --git a/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs b/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs
index d232db76f..fe8497d9e 100644
--- a/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/ContactUsValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Common;
namespace Grand.Web.Validators.Common
diff --git a/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs b/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs
index 5cea1e0a6..85a631381 100644
--- a/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/ContactVendorValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Common;
namespace Grand.Web.Validators.Common
diff --git a/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs b/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs
index 8d3d9c8b8..663bd6ca2 100644
--- a/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/AddOrderNoteValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Orders;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs b/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs
index 2674d7aa6..f5e5b2eaf 100644
--- a/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/ChangePasswordValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
index a52a233c9..a2618c11f 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutBillingAddressValidator.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Checkout;
using Grand.Web.Validators.Common;
diff --git a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
index 6d428e1fd..fccbe7b76 100644
--- a/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CheckoutShippingAddressValidator.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Checkout;
using Grand.Web.Validators.Common;
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
index 59a251c1e..5cb68b2a8 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerAddressEditValidator.cs
@@ -1,7 +1,7 @@
using Grand.Domain.Common;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
using Grand.Web.Validators.Common;
diff --git a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
index 6cb21a04a..4d8b9aafd 100644
--- a/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/CustomerInfoValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs b/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
index 82370de0c..aaff8082f 100644
--- a/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/DeleteAccountValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
index 7bdc99a54..05410d1d8 100644
--- a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs
index 6d9f6a785..cda505c6f 100644
--- a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryConfirmValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs
index c82c4d3b4..df352cad2 100644
--- a/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/PasswordRecoveryValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
index ab4b6135b..892715c67 100644
--- a/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/RegisterValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
using Grand.SharedKernel.Extensions;
diff --git a/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs b/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs
index 569edd63b..1e7f2bc01 100644
--- a/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/SubAccountValidator.cs
@@ -1,7 +1,7 @@
using FluentValidation;
using Grand.Domain.Customers;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Customer;
namespace Grand.Web.Validators.Customer
diff --git a/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs b/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
index d983e2fb1..13b184bb6 100644
--- a/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
+++ b/src/Web/Grand.Web/Validators/Knowledgebase/KnowledgebaseArticleValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Knowledgebase;
namespace Grand.Web.Validators.Knowledgebase
diff --git a/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs b/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs
index b44ed4b99..a90a0904c 100644
--- a/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs
+++ b/src/Web/Grand.Web/Validators/News/NewsItemValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.News;
namespace Grand.Web.Validators.News
diff --git a/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs b/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs
index df5bcc5ad..d7b58d21f 100644
--- a/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs
+++ b/src/Web/Grand.Web/Validators/ShoppingCart/WishlistEmailAFriendValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.ShoppingCart;
namespace Grand.Web.Validators.ShoppingCart
diff --git a/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs b/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs
index ed847e2b3..cf97f3852 100644
--- a/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/ApplyVendorValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Vendors;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Vendors;
using Grand.Web.Validators.Common;
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
index 4318736d3..68e7c4d69 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorAddressValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Vendors;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Vendors;
namespace Grand.Web.Validators.Common
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs
index 2cad7784a..18d306e0b 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorInfoValidator.cs
@@ -1,8 +1,8 @@
using FluentValidation;
using Grand.Domain.Vendors;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Directory;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Directory;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Vendors;
using Grand.Web.Validators.Common;
diff --git a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
index a3fa62d61..26e198b65 100644
--- a/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
+++ b/src/Web/Grand.Web/Validators/Vendors/VendorReviewsValidator.cs
@@ -1,6 +1,6 @@
using FluentValidation;
using Grand.Infrastructure.Validators;
-using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Web.Models.Vendors;
namespace Grand.Web.Validators.Vendors
diff --git a/src/Web/Grand.Web/Views/Common/_ContactAttributes.cshtml b/src/Web/Grand.Web/Views/Common/_ContactAttributes.cshtml
index 3923ff729..ab14f4d6a 100644
--- a/src/Web/Grand.Web/Views/Common/_ContactAttributes.cshtml
+++ b/src/Web/Grand.Web/Views/Common/_ContactAttributes.cshtml
@@ -1,7 +1,7 @@
@model IList<Grand.Web.Models.Common.ContactUsModel.ContactAttributeModel>
@using Grand.Domain.Media;
@using System.Text;
-@inject Grand.Business.Storage.Interfaces.IDownloadService downloadService
+@inject Grand.Business.Core.Interfaces.Storage.IDownloadService downloadService
@if (Model.Any())
{
diff --git a/src/Web/Grand.Web/Views/Home/Index.cshtml b/src/Web/Grand.Web/Views/Home/Index.cshtml
index ec313aebf..946ef1d2d 100644
--- a/src/Web/Grand.Web/Views/Home/Index.cshtml
+++ b/src/Web/Grand.Web/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-@inject Grand.Business.Storage.Interfaces.IPictureService pictureService
+@inject Grand.Business.Core.Interfaces.Storage.IPictureService pictureService
@inject SeoSettings seoSettings
@{
Layout = "_SingleColumn";
diff --git a/src/Web/Grand.Web/Views/Install/Index.cshtml b/src/Web/Grand.Web/Views/Install/Index.cshtml
index 90709d1e0..fc8e6f102 100644
--- a/src/Web/Grand.Web/Views/Install/Index.cshtml
+++ b/src/Web/Grand.Web/Views/Install/Index.cshtml
@@ -1,6 +1,6 @@
@model InstallModel
@using Grand.Web.Models.Install;
-@using Grand.Business.System.Interfaces.Installation;
+@using Grand.Business.Core.Interfaces.System.Installation;
@inject IInstallationLocalizedService LocalizedService
@{
Layout = null;
diff --git a/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml b/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml
index aa4b60ba7..7b6c7e8e8 100644
--- a/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml
+++ b/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml
@@ -1,13 +1,13 @@
@model (IList<Order>, string)
-@inject Grand.Business.Catalog.Interfaces.Products.IProductService _productService
-@inject Grand.Business.Common.Interfaces.Directory.ICountryService _countryService
-@inject Grand.Business.Common.Interfaces.Stores.IStoreService _storeService
-@inject Grand.Business.Storage.Interfaces.IPictureService _pictureService
+@inject Grand.Business.Core.Interfaces.Catalog.Products.IProductService _productService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICountryService _countryService
+@inject Grand.Business.Core.Interfaces.Common.Stores.IStoreService _storeService
+@inject Grand.Business.Core.Interfaces.Storage.IPictureService _pictureService
@inject PdfSettings _pdfSettings
-@inject Grand.Business.Common.Interfaces.Localization.ITranslationService _translationService
-@inject Grand.Business.Checkout.Interfaces.Payments.IPaymentService _paymentService
-@inject Grand.Business.Common.Interfaces.Directory.ICurrencyService _currencyService
-@inject Grand.Business.Checkout.Interfaces.GiftVouchers.IGiftVoucherService _giftVoucherService
+@inject Grand.Business.Core.Interfaces.Common.Localization.ITranslationService _translationService
+@inject Grand.Business.Core.Interfaces.Checkout.Payments.IPaymentService _paymentService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICurrencyService _currencyService
+@inject Grand.Business.Core.Interfaces.Checkout.GiftVouchers.IGiftVoucherService _giftVoucherService
@{
var logoPicture = await _pictureService.GetPictureById(_pdfSettings.LogoPictureId);
diff --git a/src/Web/Grand.Web/Views/PdfTemplates/ShipmentPdfTemplate.cshtml b/src/Web/Grand.Web/Views/PdfTemplates/ShipmentPdfTemplate.cshtml
index 4b0816eaf..fe2904095 100644
--- a/src/Web/Grand.Web/Views/PdfTemplates/ShipmentPdfTemplate.cshtml
+++ b/src/Web/Grand.Web/Views/PdfTemplates/ShipmentPdfTemplate.cshtml
@@ -1,19 +1,19 @@
@using Grand.Domain.Shipping
@model IList<Shipment>
-@inject Grand.Business.Checkout.Interfaces.Orders.IOrderService _orderService
-@inject Grand.Business.Checkout.Interfaces.Shipping.IShipmentService _shipmentService
-@inject Grand.Business.Common.Interfaces.Directory.ICountryService _cournyService
-@inject Grand.Business.Catalog.Interfaces.Products.IProductService _productService
-@inject Grand.Business.Common.Interfaces.Directory.ICountryService _countryService
-@inject Grand.Business.Common.Interfaces.Configuration.ISettingService _settingService
-@inject Grand.Business.Common.Interfaces.Stores.IStoreService _storeService
+@inject Grand.Business.Core.Interfaces.Checkout.Orders.IOrderService _orderService
+@inject Grand.Business.Core.Interfaces.Checkout.Shipping.IShipmentService _shipmentService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICountryService _cournyService
+@inject Grand.Business.Core.Interfaces.Catalog.Products.IProductService _productService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICountryService _countryService
+@inject Grand.Business.Core.Interfaces.Common.Configuration.ISettingService _settingService
+@inject Grand.Business.Core.Interfaces.Common.Stores.IStoreService _storeService
@inject Grand.Infrastructure.IWorkContext _workContext
-@inject Grand.Business.Storage.Interfaces.IPictureService _pictureService
+@inject Grand.Business.Core.Interfaces.Storage.IPictureService _pictureService
@inject PdfSettings _pdfSettings
-@inject Grand.Business.Common.Interfaces.Localization.ITranslationService _translationService
-@inject Grand.Business.Checkout.Interfaces.Payments.IPaymentService _paymentService
-@inject Grand.Business.Common.Interfaces.Directory.ICurrencyService _currencyService
-@inject Grand.Business.Checkout.Interfaces.GiftVouchers.IGiftVoucherService _giftVoucherService
+@inject Grand.Business.Core.Interfaces.Common.Localization.ITranslationService _translationService
+@inject Grand.Business.Core.Interfaces.Checkout.Payments.IPaymentService _paymentService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICurrencyService _currencyService
+@inject Grand.Business.Core.Interfaces.Checkout.GiftVouchers.IGiftVoucherService _giftVoucherService
@{
var logoPicture = await _pictureService.GetPictureById(_pdfSettings.LogoPictureId);
diff --git a/src/Web/Grand.Web/Views/Shared/_HeaderLinks.cshtml b/src/Web/Grand.Web/Views/Shared/_HeaderLinks.cshtml
index 84fe5cdbf..bf416ef97 100644
--- a/src/Web/Grand.Web/Views/Shared/_HeaderLinks.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_HeaderLinks.cshtml
@@ -1,12 +1,12 @@
-@inject Grand.Business.Common.Interfaces.Directory.IGroupService groupService
+@inject Grand.Business.Core.Interfaces.Common.Directory.IGroupService groupService
@inject IWorkContext workContext
@inject IPageHeadBuilder pagebuilder
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
@{
var registerUrl = Url.RouteUrl("Register", new { returnUrl = this.Context.Request.Query["returnUrl"] });
var isAuthenticated = await groupService.IsRegistered(workContext.CurrentCustomer);
var isCustomerImpersonated = workContext.OriginalCustomerIfImpersonated != null;
- var isAdminAccess = await permissionService.Authorize(Grand.Business.Common.Services.Security.StandardPermission.AccessAdminPanel);
+ var isAdminAccess = await permissionService.Authorize(Grand.Business.Core.Utilities.Common.Security.StandardPermission.AccessAdminPanel);
}
@await Component.InvokeAsync("Widget", new { widgetZone = "header_links_before" })
diff --git a/src/Web/Grand.Web/Views/Shared/_Logo.cshtml b/src/Web/Grand.Web/Views/Shared/_Logo.cshtml
index 6c0cdea72..21af6e480 100644
--- a/src/Web/Grand.Web/Views/Shared/_Logo.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_Logo.cshtml
@@ -1,6 +1,6 @@
@inject StoreInformationSettings storeInformation
@inject IWorkContext workContext
-@inject Grand.Business.Storage.Interfaces.IPictureService pictureService
+@inject Grand.Business.Core.Interfaces.Storage.IPictureService pictureService
@{
var urlLogo = await pictureService.GetPictureUrl(storeInformation.LogoPictureId);
}
diff --git a/src/Web/Grand.Web/Views/Shared/_Selector_Currency.cshtml b/src/Web/Grand.Web/Views/Shared/_Selector_Currency.cshtml
index 26654b85b..26b64ffb1 100644
--- a/src/Web/Grand.Web/Views/Shared/_Selector_Currency.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_Selector_Currency.cshtml
@@ -1,7 +1,7 @@
@using System.Globalization
-@using Grand.Business.Common.Extensions
+@using Grand.Business.Core.Extensions
-@inject Grand.Business.Common.Interfaces.Directory.ICurrencyService currencyService
+@inject Grand.Business.Core.Interfaces.Common.Directory.ICurrencyService currencyService
@inject IWorkContext workContext
@{
diff --git a/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml b/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml
index 5fdb8d002..365497000 100644
--- a/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_Selector_Language.cshtml
@@ -1,4 +1,4 @@
-@inject Grand.Business.Common.Interfaces.Localization.ILanguageService languageService
+@inject Grand.Business.Core.Interfaces.Common.Localization.ILanguageService languageService
@inject IWorkContext workContext
@{
var availableLanguages = (await languageService.GetAllLanguages(storeId: workContext.CurrentStore.Id))
diff --git a/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml b/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml
index 12082a48d..32884342c 100644
--- a/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_Selector_Store.cshtml
@@ -1,6 +1,6 @@
@inject CommonSettings commonSettings
-@using Grand.Business.Common.Extensions
-@inject Grand.Business.Common.Interfaces.Stores.IStoreService storeService
+@using Grand.Business.Core.Extensions
+@inject Grand.Business.Core.Interfaces.Common.Stores.IStoreService storeService
@inject IWorkContext workContext
@{
if (commonSettings.AllowToSelectStore)
diff --git a/src/Web/Grand.Web/Views/Shared/_ShoppingCartLinks.cshtml b/src/Web/Grand.Web/Views/Shared/_ShoppingCartLinks.cshtml
index 77d9a36ff..1377c7360 100644
--- a/src/Web/Grand.Web/Views/Shared/_ShoppingCartLinks.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/_ShoppingCartLinks.cshtml
@@ -1,9 +1,9 @@
@inject IWorkContext workContext
-@inject Grand.Business.Common.Interfaces.Security.IPermissionService permissionService
-@inject Grand.Business.Checkout.Interfaces.Orders.IShoppingCartService shoppingCartService
+@inject Grand.Business.Core.Interfaces.Common.Security.IPermissionService permissionService
+@inject Grand.Business.Core.Interfaces.Checkout.Orders.IShoppingCartService shoppingCartService
@inject ShoppingCartSettings shoppingCartSettings
@inject CatalogSettings catalogSettings
-@using Grand.Business.Common.Services.Security
+@using Grand.Business.Core.Utilities.Common.Security
@{
var shoppingCartTypes = new List<ShoppingCartType>();