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.

Refactor controller methods

support25c3f9d5c5f5
diff --git a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
index 441882a22..b7a15dcbd 100644
--- a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs
@@ -352,7 +352,7 @@ namespace Grand.Web.Admin.Controllers
[PermissionAuthorizeAction(PermissionActionName.Import)]
[HttpPost]
- public async Task<IActionResult> ImportFromXlsx(IFormFile importexcelfile, [FromServices] IWorkContext workContext, [FromServices] IImportManager<BrandDto> importManager)
+ public async Task<IActionResult> ImportFromXlsx(IFormFile importexcelfile, [FromServices] IImportManager<BrandDto> importManager)
{
try
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
index 8045eabe4..8f1fd49e6 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
@@ -167,8 +167,7 @@ namespace Grand.Web.Admin.Controllers
//delete
[HttpPost]
[PermissionAuthorizeAction(PermissionActionName.Delete)]
- public async Task<IActionResult> Delete(string id,
- [FromServices] IWorkContext workContext)
+ public async Task<IActionResult> Delete(string id)
{
var checkoutAttribute = await _checkoutAttributeService.GetCheckoutAttributeById(id);
await _checkoutAttributeService.DeleteCheckoutAttribute(checkoutAttribute);
diff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
index 7ef97a462..444ae9787 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs
@@ -352,7 +352,7 @@ namespace Grand.Web.Admin.Controllers
[PermissionAuthorizeAction(PermissionActionName.Import)]
[HttpPost]
- public async Task<IActionResult> ImportFromXlsx(IFormFile importexcelfile, [FromServices] IWorkContext workContext, [FromServices] IImportManager<CollectionDto> importManager)
+ public async Task<IActionResult> ImportFromXlsx(IFormFile importexcelfile, [FromServices] IImportManager<CollectionDto> importManager)
{
try
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
index 7d30325e5..5084afa47 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ContactAttributeController.cs
@@ -146,8 +146,7 @@ namespace Grand.Web.Admin.Controllers
//delete
[HttpPost]
[PermissionAuthorizeAction(PermissionActionName.Delete)]
- public async Task<IActionResult> Delete(string id,
- [FromServices] IWorkContext workContext)
+ public async Task<IActionResult> Delete(string id)
{
if (ModelState.IsValid)
{
diff --git a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
index 842b8ef9a..c56cb5d96 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CourseController.cs
@@ -288,7 +288,7 @@ namespace Grand.Web.Admin.Controllers
[PermissionAuthorizeAction(PermissionActionName.Edit)]
[HttpPost]
public async Task<IActionResult> AssociateProductToCoursePopupList(DataSourceRequest command,
- CourseModel.AssociateProductToCourseModel model, [FromServices] IWorkContext workContext)
+ CourseModel.AssociateProductToCourseModel model)
{
var products = await _courseViewModelService.PrepareProductModel(model, command.Page, command.PageSize);
var gridModel = new DataSourceResult
@@ -303,7 +303,7 @@ namespace Grand.Web.Admin.Controllers
[PermissionAuthorizeAction(PermissionActionName.Edit)]
[HttpPost]
public async Task<IActionResult> AssociateProductToCoursePopup(string btnId, string productIdInput,
- string productNameInput, CourseModel.AssociateProductToCourseModel model, [FromServices] IProductService productService, [FromServices] IWorkContext workContext)
+ string productNameInput, CourseModel.AssociateProductToCourseModel model, [FromServices] IProductService productService)
{
var associatedProduct = await productService.GetProductById(model.AssociatedToProductId);
if (associatedProduct == null)
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
index f53a299b7..8f09f98b9 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
@@ -2305,7 +2305,7 @@ namespace Grand.Web.Admin.Controllers
[PermissionAuthorizeAction(PermissionActionName.Edit)]
[HttpPost]
- public async Task<IActionResult> ClearAllAttributeCombinations(string productId, [FromServices] IProductAttributeService productAttributeService)
+ public async Task<IActionResult> ClearAllAttributeCombinations(string productId)
{
var product = await _productService.GetProductById(productId);
if (product == null)
diff --git a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
index 2a63db9e7..1d3349392 100644
--- a/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/VendorController.cs
@@ -279,7 +279,7 @@ namespace Grand.Web.Admin.Controllers
[PermissionAuthorizeAction(PermissionActionName.Preview)]
[HttpPost]
- public async Task<IActionResult> Reviews(DataSourceRequest command, string vendorId, [FromServices] IWorkContext workContext)
+ public async Task<IActionResult> Reviews(DataSourceRequest command, string vendorId)
{
var vendor = await _vendorService.GetVendorById(vendorId);
if (vendor == null)
diff --git a/src/Web/Grand.Web/Controllers/CatalogController.cs b/src/Web/Grand.Web/Controllers/CatalogController.cs
index fc19f818c..dacf6dac7 100644
--- a/src/Web/Grand.Web/Controllers/CatalogController.cs
+++ b/src/Web/Grand.Web/Controllers/CatalogController.cs
@@ -367,7 +367,7 @@ namespace Grand.Web.Controllers
[DenySystemAccount]
[HttpPost]
- public virtual async Task<IActionResult> SetVendorReviewHelpfulness(string VendorReviewId, string vendorId, bool washelpful, [FromServices] ICustomerService customerService)
+ public virtual async Task<IActionResult> SetVendorReviewHelpfulness(string VendorReviewId, string vendorId, bool washelpful)
{
var vendor = await _vendorService.GetVendorById(vendorId);
var vendorReview = await _vendorService.GetVendorReviewById(VendorReviewId);