Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Remove unused using
KrzysztofPajakbc6a6c673b66
diff --git a/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs b/src/Web/Grand.Web.Admin/Controllers/AffiliateController.csindex e7b483fcb..64ee3caf8 100644--- a/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/AffiliateController.cs@@ -1,20 +1,19 @@-using Grand.Business.Common.Interfaces.Localization;+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.Web.Common.Controllers;+using Grand.Business.Customers.Queries.Models;+using Grand.Web.Admin.Interfaces;+using Grand.Web.Admin.Models.Affiliates;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Admin.Interfaces;-using Grand.Web.Admin.Models.Affiliates;+using MediatR;using Microsoft.AspNetCore.Mvc;using System;-using System.Threading.Tasks;-using Grand.Business.Customers.Queries.Models;-using MediatR;using System.Linq;-using Grand.Business.Checkout.Queries.Models.Orders;+using System.Threading.Tasks;namespace Grand.Web.Admin.Controllers{diff --git a/src/Web/Grand.Web.Admin/Controllers/BannerController.cs b/src/Web/Grand.Web.Admin/Controllers/BannerController.csindex 7943a314a..ab02ca34c 100644--- a/src/Web/Grand.Web.Admin/Controllers/BannerController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/BannerController.cs@@ -2,12 +2,11 @@using Grand.Business.Common.Interfaces.Localization;using Grand.Business.Common.Services.Security;using Grand.Business.Marketing.Interfaces.Banners;-using Grand.Web.Common.Controllers;+using Grand.Web.Admin.Extensions;+using Grand.Web.Admin.Models.Messages;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Admin.Extensions;-using Grand.Web.Admin.Models.Messages;using Microsoft.AspNetCore.Mvc;using System;using System.Linq;diff --git a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs b/src/Web/Grand.Web.Admin/Controllers/BlogController.csindex 776feb514..41d6e1ffb 100644--- a/src/Web/Grand.Web.Admin/Controllers/BlogController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/BlogController.cs@@ -4,15 +4,14 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Seo;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Blogs;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;using System;diff --git a/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs b/src/Web/Grand.Web.Admin/Controllers/CampaignController.csindex b6007a259..4506f643e 100644--- a/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CampaignController.cs@@ -5,16 +5,15 @@ 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.Infrastructure;using Grand.Domain.Messages;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Infrastructure;using Grand.SharedKernel;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Messages;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;diff --git a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/CategoryController.csindex 1be77f9f4..a5dfbf641 100644--- a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs@@ -6,15 +6,14 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Catalog;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using System;@@ -114,7 +113,7 @@ namespace Grand.Web.Admin.Controllers};return Json(gridModel);}-+#endregion#region Create / Edit / Deletediff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.csindex c07e90e3b..79ecc26d8 100644--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs@@ -5,15 +5,14 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Catalog;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;diff --git a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.csindex 278e46375..b58de5bf9 100644--- a/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CurrencyController.cs@@ -4,16 +4,15 @@ 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.Infrastructure.Caching;using Grand.Domain.Directory;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Infrastructure.Caching;using Grand.SharedKernel;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Directory;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.csindex 98e134cbd..68a5f43f6 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerActionController.cs@@ -8,16 +8,15 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Catalog;using Grand.Domain.Customers;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Customers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;using System;diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.csindex 3b0c20f76..4a185cf4d 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs@@ -10,10 +10,6 @@ using Grand.Business.Customers.Utilities;using Grand.Business.Messages.Interfaces;using Grand.Business.Storage.Interfaces;using Grand.Business.System.Interfaces.ExportImport;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Catalog;using Grand.Domain.Common;using Grand.Domain.Customers;@@ -26,6 +22,9 @@ using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Customers;using Grand.Web.Admin.Models.Orders;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using System;diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.csindex a6e677f45..952c95bd8 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerGroupController.cs@@ -4,15 +4,14 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Infrastructure;using Grand.SharedKernel;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Customers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.csindex 663b9115c..75dd97c0a 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerReminderController.cs@@ -8,15 +8,14 @@ using Grand.Business.Common.Services.Security;using Grand.Business.Customers.Interfaces;using Grand.Business.Marketing.Interfaces.Customers;using Grand.Business.Messages.Interfaces;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Catalog;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Customers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.csindex ef7c1a3bc..35f3dd4c5 100644--- a/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CustomerTagController.cs@@ -2,13 +2,12 @@using Grand.Business.Common.Interfaces.Localization;using Grand.Business.Common.Services.Security;using Grand.Business.Marketing.Interfaces.Customers;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Customers;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;diff --git a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs b/src/Web/Grand.Web.Admin/Controllers/DiscountController.csindex ef74fe991..3b165e406 100644--- a/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/DiscountController.cs@@ -1,28 +1,27 @@-using Grand.Business.Catalog.Interfaces.Categories;-using Grand.Business.Catalog.Interfaces.Discounts;+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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Discounts;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;using System.Linq;using System.Threading.Tasks;-using Grand.Business.Catalog.Interfaces.Brands;namespace Grand.Web.Admin.Controllers{diff --git a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.csindex 897713d2f..51df4ed6b 100644--- a/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/EmailAccountController.cs@@ -2,16 +2,15 @@using Grand.Business.Common.Interfaces.Localization;using Grand.Business.Common.Services.Security;using Grand.Business.Messages.Interfaces;-using Grand.Infrastructure.Caching;using Grand.Domain.Messages;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Infrastructure.Caching;using Grand.SharedKernel;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Messages;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Linq;@@ -126,7 +125,7 @@ namespace Grand.Web.Admin.Controllers//If we got this far, something failed, redisplay formreturn View(model);}-+[HttpPost][PermissionAuthorizeAction(PermissionActionName.Edit)]public async Task<IActionResult> SendTestEmail(EmailAccountModel model)diff --git a/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs b/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.csindex eecf3a5a8..65048b569 100644--- a/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/GiftVoucherController.cs@@ -1,13 +1,12 @@using Grand.Business.Checkout.Interfaces.GiftVouchers;using Grand.Business.Common.Interfaces.Localization;using Grand.Business.Common.Services.Security;-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Orders;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System;using System.Linq;diff --git a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.csindex 8247cb4cf..3c057c726 100644--- a/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/KnowledgebaseController.cs@@ -4,13 +4,12 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Knowledgebase;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;using System;@@ -99,7 +98,7 @@ namespace Grand.Web.Admin.Controllerspublic async Task<IActionResult> CreateCategory(){var model = await _knowledgebaseViewModelService.PrepareKnowledgebaseCategoryModel();-+await AddLocales(_languageService, model.Locales);return View(model);}diff --git a/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs b/src/Web/Grand.Web.Admin/Controllers/LoggerController.csindex c3a46fc80..dfe443c57 100644--- a/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/LoggerController.cs@@ -1,11 +1,10 @@-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Security.Authorization;-using Grand.Business.Common.Interfaces.Localization;+using Grand.Business.Common.Interfaces.Localization;using Grand.Business.Common.Interfaces.Logging;using Grand.Business.Common.Services.Security;-using Grand.Web.Admin.Models.Logging;using Grand.Web.Admin.Interfaces;+using Grand.Web.Admin.Models.Logging;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System.Collections.Generic;using System.Linq;@@ -20,7 +19,7 @@ namespace Grand.Web.Admin.Controllersprivate readonly ILogger _logger;private readonly ITranslationService _translationService;- public LoggerController(ILogViewModelService logViewModelService, ILogger logger,+ public LoggerController(ILogViewModelService logViewModelService, ILogger logger,ITranslationService translationService){_logViewModelService = logViewModelService;diff --git a/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs b/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.csindex 9381b9f5b..b2e067b1b 100644--- a/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/MerchandiseReturnController.cs@@ -3,16 +3,15 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Common;using Grand.Domain.Orders;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Orders;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using System;diff --git a/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs b/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.csindex 24388e9a6..0adf2652b 100644--- a/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/MessageTemplateController.cs@@ -4,12 +4,11 @@ using Grand.Business.Common.Interfaces.Stores;using Grand.Business.Common.Services.Security;using Grand.Business.Messages.Interfaces;using Grand.Domain.Messages;-using Grand.Web.Common.Controllers;+using Grand.Web.Admin.Extensions;+using Grand.Web.Admin.Models.Messages;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Admin.Extensions;-using Grand.Web.Admin.Models.Messages;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;using System;diff --git a/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.csindex 8b21a0636..fcdb52f66 100644--- a/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/NewsLetterCategoryController.cs@@ -1,14 +1,12 @@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.Marketing.Interfaces.Newsletters;-using Grand.Web.Common.Controllers;+using Grand.Web.Admin.Extensions;+using Grand.Web.Admin.Models.Messages;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Admin.Extensions;-using Grand.Web.Admin.Models.Messages;using Microsoft.AspNetCore.Mvc;using System.Linq;using System.Threading.Tasks;@@ -23,19 +21,19 @@ namespace Grand.Web.Admin.Controllersprivate readonly INewsletterCategoryService _newsletterCategoryService;private readonly ILanguageService _languageService;private readonly ITranslationService _translationService;- private readonly IStoreService _storeService;#endregion#region Ctor- public NewsletterCategoryController(INewsletterCategoryService newsletterCategoryService, ILanguageService languageService,- ITranslationService translationService, IStoreService storeService)+ public NewsletterCategoryController(+ INewsletterCategoryService newsletterCategoryService,+ ILanguageService languageService,+ ITranslationService translationService){_newsletterCategoryService = newsletterCategoryService;_languageService = languageService;_translationService = translationService;- _storeService = storeService;}#endregiondiff --git a/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs b/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.csindex e6c58c5b3..5f1435e70 100644--- a/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/NewsLetterSubscriptionController.cs@@ -4,14 +4,13 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Extensions;-using Grand.Web.Common.Security.Authorization;using Grand.Infrastructure;using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Models.Messages;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Extensions;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;using Microsoft.AspNetCore.Mvc.Rendering;diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.csindex 1fb162223..cafa3c5e2 100644--- a/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentTransactionController.cs@@ -10,7 +10,6 @@ using Grand.Domain.Payments;using Grand.Infrastructure;using Grand.SharedKernel;using Grand.Web.Admin.Models.Orders;-using Grand.Web.Common.Controllers;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/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.csindex 817f73102..880fcc579 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs@@ -9,17 +9,16 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Extensions;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Domain.Catalog;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Catalog;using Grand.Web.Admin.Models.Orders;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Extensions;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using MediatR;using Microsoft.AspNetCore.Http;using Microsoft.AspNetCore.Mvc;diff --git a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.csindex 595fca249..e20435698 100644--- a/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/QueuedEmailController.cs@@ -3,14 +3,13 @@ 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.Infrastructure;using Grand.Domain.Messages;-using Grand.Web.Common.Controllers;+using Grand.Infrastructure;+using Grand.Web.Admin.Extensions;+using Grand.Web.Admin.Models.Messages;using Grand.Web.Common.DataSource;using Grand.Web.Common.Filters;using Grand.Web.Common.Security.Authorization;-using Grand.Web.Admin.Extensions;-using Grand.Web.Admin.Models.Messages;using Microsoft.AspNetCore.Mvc;using System;using System.Collections.Generic;diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex 15d92311a..eed21e931 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -35,7 +35,6 @@ using Grand.SharedKernel.Extensions;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Models.PushNotifications;using Grand.Web.Admin.Models.Settings;-using Grand.Web.Common.Controllers;using Grand.Web.Common.DataSource;using Grand.Web.Common.Extensions;using Grand.Web.Common.Filters;@@ -1315,7 +1314,7 @@ namespace Grand.Web.Admin.Controllers//doc settingsvar docsettings = _settingService.LoadSetting<DocumentSettings>();- docsettings.PageSize= model.DocumentPageSizeSettings;+ docsettings.PageSize = model.DocumentPageSizeSettings;await _settingService.SaveSetting(docsettings);//now clear cachediff --git a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs b/src/Web/Grand.Web.Admin/Controllers/StoreController.csindex 36feb7e34..8aeb22610 100644--- a/src/Web/Grand.Web.Admin/Controllers/StoreController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/StoreController.cs@@ -1,17 +1,16 @@-using Grand.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;+using Grand.Business.Common.Extensions;using Grand.Business.Common.Interfaces.Localization;-using Grand.Business.Common.Services.Security;using Grand.Business.Common.Interfaces.Stores;+using Grand.Business.Common.Services.Security;using Grand.Web.Admin.Extensions;-using Grand.Web.Admin.Models.Stores;using Grand.Web.Admin.Interfaces;+using Grand.Web.Admin.Models.Stores;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using Microsoft.AspNetCore.Mvc;using System.Linq;using System.Threading.Tasks;-using Grand.Business.Common.Extensions;namespace Grand.Web.Admin.Controllers{diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorController.csindex a61b4ee6f..a813eac4c 100644--- a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs@@ -3,14 +3,13 @@ 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.Web.Common.Controllers;-using Grand.Web.Common.DataSource;-using Grand.Web.Common.Filters;-using Grand.Web.Common.Security.Authorization;using Grand.Infrastructure;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Interfaces;using Grand.Web.Admin.Models.Vendors;+using Grand.Web.Common.DataSource;+using Grand.Web.Common.Filters;+using Grand.Web.Common.Security.Authorization;using MediatR;using Microsoft.AspNetCore.Mvc;using System;@@ -24,11 +23,13 @@ namespace Grand.Web.Admin.Controllerspublic partial class VendorController : BaseAdminController{#region Fields+private readonly IVendorViewModelService _vendorViewModelService;private readonly ITranslationService _translationService;private readonly IVendorService _vendorService;private readonly ILanguageService _languageService;private readonly IMediator _mediator;+#endregion#region Constructors