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.

Newsletter category - remove IFormCollection

supportef8998aa8257
diff --git a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
index b4756e582..bd446aaba 100644
--- a/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/Newsletter/SubscriptionCategoryHandler.cs
@@ -4,7 +4,8 @@ using MediatR;
namespace Grand.Web.Commands.Handler.Newsletter
{
- public class SubscriptionCategoryHandler : IRequestHandler<SubscriptionCategoryCommand, (string message, bool success)>
+ public class
+ SubscriptionCategoryHandler : IRequestHandler<SubscriptionCategoryCommand, (string message, bool success)>
{
private readonly INewsLetterSubscriptionService _newsLetterSubscriptionService;
@@ -13,32 +14,24 @@ namespace Grand.Web.Commands.Handler.Newsletter
_newsLetterSubscriptionService = newsLetterSubscriptionService;
}
- public async Task<(string message, bool success)> Handle(SubscriptionCategoryCommand request, CancellationToken cancellationToken)
+ public async Task<(string message, bool success)> Handle(SubscriptionCategoryCommand request,
+ CancellationToken cancellationToken)
{
bool success = false;
string message = string.Empty;
- var newsletterEmailId = request.Values["NewsletterEmailId"].ToString();
+ var newsletterEmailId = request.Model.NewsletterEmailId;
if (!string.IsNullOrEmpty(newsletterEmailId))
{
- var subscription = await _newsLetterSubscriptionService.GetNewsLetterSubscriptionById(newsletterEmailId);
+ var subscription =
+ await _newsLetterSubscriptionService.GetNewsLetterSubscriptionById(newsletterEmailId);
if (subscription != null)
{
- foreach (string formKey in request.Values.Keys)
+ foreach (var category in request.Model.Category)
{
- if (formKey.Contains("Category_"))
- {
- try
- {
- var category = formKey.Split('_')[1];
- subscription.Categories.Add(category);
- }
- catch (Exception ex)
- {
- message = ex.Message;
- }
- }
+ subscription.Categories.Add(category);
}
+
success = true;
await _newsLetterSubscriptionService.UpdateNewsLetterSubscription(subscription, false);
}
@@ -53,4 +46,4 @@ namespace Grand.Web.Commands.Handler.Newsletter
return (message, success);
}
}
-}
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
index ad277a925..56439e9a5 100644
--- a/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
+++ b/src/Web/Grand.Web/Commands/Models/Newsletter/SubscriptionCategoryCommand.cs
@@ -1,9 +1,10 @@
-using MediatR;
+using Grand.Web.Models.Newsletter;
+using MediatR;
namespace Grand.Web.Commands.Models.Newsletter
{
public class SubscriptionCategoryCommand : IRequest<(string message, bool success)>
{
- public IDictionary<string, string> Values { get; set; }
+ public NewsletterCategoryModel Model { get; set; }
}
}
diff --git a/src/Web/Grand.Web/Controllers/NewsletterController.cs b/src/Web/Grand.Web/Controllers/NewsletterController.cs
index b9c39332c..4c854f3d5 100644
--- a/src/Web/Grand.Web/Controllers/NewsletterController.cs
+++ b/src/Web/Grand.Web/Controllers/NewsletterController.cs
@@ -1,6 +1,7 @@
using Grand.Web.Commands.Models.Newsletter;
using Grand.Web.Common.Controllers;
using Grand.Web.Common.Filters;
+using Grand.Web.Models.Newsletter;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -36,13 +37,13 @@ namespace Grand.Web.Controllers
}
[HttpPost]
- public virtual async Task<IActionResult> SaveCategories(IFormCollection form)
+ public virtual async Task<IActionResult> SaveCategories(NewsletterCategoryModel model)
{
- var model = await _mediator.Send(new SubscriptionCategoryCommand() { Values = form.Keys.ToDictionary(k => k, v => Request.Form[v].ToString()) });
+ var result = await _mediator.Send(new SubscriptionCategoryCommand() { Model = model});
return Json(new
{
- Success = model.success,
- Message = model.message
+ Success = result.success,
+ Message = result.message
});
}
diff --git a/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs b/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs
index 66a9c0868..6392de885 100644
--- a/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs
+++ b/src/Web/Grand.Web/Models/Newsletter/NewsletterCategoryModel.cs
@@ -9,6 +9,7 @@ namespace Grand.Web.Models.Newsletter
NewsletterCategories = new List<NewsletterSimpleCategory>();
}
public string NewsletterEmailId { get; set; }
+ public string[] Category { get; set; }
public IList<NewsletterSimpleCategory> NewsletterCategories { get; set; }
}
public class NewsletterSimpleCategory
diff --git a/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml b/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml
index e9ac67a1b..cfb51a49c 100644
--- a/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml
+++ b/src/Web/Grand.Web/Views/Newsletter/NewsletterCategory.cshtml
@@ -7,7 +7,8 @@
@foreach (var category in Model.NewsletterCategories)
{
<label for="Category_@(category.Id)" class="custom-control custom-checkbox col-12">
- <input id="Category_@(category.Id)" name="Category_@(category.Id)" type="checkbox" class="custom-control-input" @(category.Selected ? "checked" : "")>
+ <input id="Category_@(category.Id)" name="category" type="checkbox" value="@(category.Id)"
+ class="custom-control-input" @(category.Selected ? "checked" : "")>
<span class="custom-control-label"></span>
<span class="custom-control-description">@category.Name</span>
</label>