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.

Admin panel - CheckoutAttributeController.cs - changes with validators

supporte7ef392af0e8
diff --git a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
index cfc1ba449..b8ccbb38a 100644
--- a/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/CheckoutAttributeController.cs
@@ -213,23 +213,15 @@ namespace Grand.Web.Admin.Controllers
//No checkout attribute found with the specified id
return RedirectToAction("List");
- model.PrimaryStoreCurrencyCode = (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;
- model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;
-
- if (checkoutAttribute.AttributeControlTypeId == AttributeControlType.ColorSquares)
- {
- //ensure valid color is chosen/entered
- if (string.IsNullOrEmpty(model.ColorSquaresRgb))
- ModelState.AddModelError("", "Color is required");
- }
-
if (ModelState.IsValid)
{
await _checkoutAttributeViewModelService.InsertCheckoutAttributeValueModel(checkoutAttribute, model);
return Content("");
}
-
+
//If we got this far, something failed, redisplay form
+ model.PrimaryStoreCurrencyCode = (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;
+ model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;
return View(model);
}
@@ -264,17 +256,7 @@ namespace Grand.Web.Admin.Controllers
if (cav == null)
//No checkout attribute value found with the specified id
return RedirectToAction("List");
-
- model.PrimaryStoreCurrencyCode = (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;
- model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;
-
- if (checkoutAttribute.AttributeControlTypeId == AttributeControlType.ColorSquares)
- {
- //ensure valid color is chosen/entered
- if (string.IsNullOrEmpty(model.ColorSquaresRgb))
- ModelState.AddModelError("", "Color is required");
- }
-
+
if (ModelState.IsValid)
{
await _checkoutAttributeViewModelService.UpdateCheckoutAttributeValueModel(checkoutAttribute, cav, model);
@@ -282,6 +264,9 @@ namespace Grand.Web.Admin.Controllers
}
//If we got this far, something failed, redisplay form
+ model.PrimaryStoreCurrencyCode = (await _currencyService.GetCurrencyById(_currencySettings.PrimaryStoreCurrencyId)).CurrencyCode;
+ model.BaseWeightIn = (await _measureService.GetMeasureWeightById(_measureSettings.BaseWeightId)).Name;
+
return View(model);
}
diff --git a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
index aba6a739c..26f1cfbca 100644
--- a/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
+++ b/src/Web/Grand.Web.Admin/Validators/Orders/CheckoutAttributeValueValidator.cs
@@ -1,6 +1,8 @@
using FluentValidation;
+using Grand.Business.Core.Interfaces.Checkout.CheckoutAttributes;
using Grand.Infrastructure.Validators;
using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Domain.Catalog;
using Grand.Web.Admin.Models.Orders;
namespace Grand.Web.Admin.Validators.Orders
@@ -9,10 +11,20 @@ namespace Grand.Web.Admin.Validators.Orders
{
public CheckoutAttributeValueValidator(
IEnumerable<IValidatorConsumer<CheckoutAttributeValueModel>> validators,
+ ICheckoutAttributeService checkoutAttributeService,
ITranslationService translationService)
: base(validators)
{
RuleFor(x => x.Name).NotEmpty().WithMessage(translationService.GetResource("Admin.Orders.CheckoutAttributes.Values.Fields.Name.Required"));
+ RuleFor(x => x).CustomAsync(async (x, context, _) =>
+ {
+ var checkoutAttribute = await checkoutAttributeService.GetCheckoutAttributeById(x.CheckoutAttributeId);
+ if (checkoutAttribute is { AttributeControlTypeId: AttributeControlType.ColorSquares }
+ && string.IsNullOrEmpty(x.ColorSquaresRgb))
+ {
+ context.AddFailure("Color is required");
+ }
+ });
}
}
}
\ No newline at end of file