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.

Further changes - parse date for the checkout attributes

KrzysztofPajak82df996a5d6c
diff --git a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
index 0a57a00ae..863643067 100644
--- a/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
+++ b/src/Web/Grand.Web/Commands/Handler/ShoppingCart/SaveCheckoutAttributesCommandHandler.cs
@@ -104,18 +104,8 @@ namespace Grand.Web.Commands.Handler.ShoppingCart
case AttributeControlType.Datepicker:
{
request.Form.TryGetValue(controlId, out var dateAttributes);
- DateTime? selectedDate = null;
- try
- {
- selectedDate = DateTime.Parse(dateAttributes);
-
- }
- catch { }
- if (selectedDate.HasValue)
- {
- customAttributes = _checkoutAttributeParser.AddCheckoutAttribute(customAttributes,
- attribute, selectedDate.Value.ToString("D")).ToList();
- }
+ customAttributes = _checkoutAttributeParser.AddCheckoutAttribute(customAttributes,
+ attribute, dateAttributes).ToList();
}
break;
case AttributeControlType.FileUpload:
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
index f5404e33a..2eb6d2566 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetParseProductAttributesHandler.cs
@@ -106,17 +106,8 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
case AttributeControlType.Datepicker:
{
request.Form.TryGetValue(controlId, out var dateAttributes);
- DateTime? selectedDate = null;
- try
- {
- selectedDate = DateTime.Parse(dateAttributes);
- }
- catch { }
- if (selectedDate.HasValue)
- {
- customAttributes = _productAttributeParser.AddProductAttribute(customAttributes,
- attribute, selectedDate.Value.ToString("D")).ToList();
- }
+ customAttributes = _productAttributeParser.AddProductAttribute(customAttributes,
+ attribute, dateAttributes).ToList();
}
break;
case AttributeControlType.FileUpload:
diff --git a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
index 08f4b3d69..5a9909ad1 100644
--- a/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/ShoppingCart/GetShoppingCartHandler.cs
@@ -180,8 +180,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
}
else
{
- var minOrderSubtotalAmountOk = await _mediator.Send(new ValidateMinShoppingCartSubtotalAmountCommand()
- {
+ var minOrderSubtotalAmountOk = await _mediator.Send(new ValidateMinShoppingCartSubtotalAmountCommand() {
Customer = request.Customer,
Cart = request.Cart.Where(x => x.ShoppingCartTypeId == ShoppingCartType.ShoppingCart || x.ShoppingCartTypeId == ShoppingCartType.Auctions).ToList()
});
@@ -203,8 +202,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
discount.RequiresCouponCode &&
(await _discountService.ValidateDiscount(discount, request.Customer, request.Currency)).IsValid)
{
- model.DiscountBox.AppliedDiscountsWithCodes.Add(new ShoppingCartModel.DiscountBoxModel.DiscountInfoModel()
- {
+ model.DiscountBox.AppliedDiscountsWithCodes.Add(new ShoppingCartModel.DiscountBoxModel.DiscountInfoModel() {
Id = discount.Id,
CouponCode = couponCode
});
@@ -228,8 +226,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
var checkoutAttributes = await _checkoutAttributeService.GetAllCheckoutAttributes(request.Store.Id, !request.Cart.RequiresShipping());
foreach (var attribute in checkoutAttributes)
{
- var attributeModel = new ShoppingCartModel.CheckoutAttributeModel
- {
+ var attributeModel = new ShoppingCartModel.CheckoutAttributeModel {
Id = attribute.Id,
Name = attribute.GetTranslation(x => x.Name, request.Language.Id),
TextPrompt = attribute.GetTranslation(x => x.TextPrompt, request.Language.Id),
@@ -250,8 +247,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
var attributeValues = attribute.CheckoutAttributeValues;
foreach (var attributeValue in attributeValues)
{
- var attributeValueModel = new ShoppingCartModel.CheckoutAttributeValueModel
- {
+ var attributeValueModel = new ShoppingCartModel.CheckoutAttributeValueModel {
Id = attributeValue.Id,
Name = attributeValue.GetTranslation(x => x.Name, request.Language.Id),
ColorSquaresRgb = attributeValue.ColorSquaresRgb,
@@ -322,12 +318,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
var selectedDateStr = selectedCheckoutAttributes.Where(x => x.Key == attribute.Id).Select(x => x.Value).ToList();
if (selectedDateStr.Any())
{
- DateTime selectedDate;
- if (DateTime.TryParseExact(selectedDateStr[0], "D", CultureInfo.CurrentCulture,
- DateTimeStyles.None, out selectedDate))
- {
- attributeModel.DefaultValue = selectedDateStr[0];
- }
+ attributeModel.DefaultValue = selectedDateStr[0];
}
}
}
@@ -364,8 +355,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
if (product == null)
continue;
var sename = product.GetSeName(request.Language.Id);
- var cartItemModel = new ShoppingCartModel.ShoppingCartItemModel
- {
+ var cartItemModel = new ShoppingCartModel.ShoppingCartItemModel {
Id = sci.Id,
Sku = product.FormatSku(sci.Attributes, _productAttributeParser),
IsCart = sci.ShoppingCartTypeId == ShoppingCartType.ShoppingCart,
@@ -402,8 +392,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
var allowedQuantities = product.ParseAllowedQuantities();
foreach (var qty in allowedQuantities)
{
- cartItemModel.AllowedQuantities.Add(new SelectListItem
- {
+ cartItemModel.AllowedQuantities.Add(new SelectListItem {
Text = qty.ToString(),
Value = qty.ToString(),
Selected = sci.Quantity == qty
@@ -521,8 +510,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
//billing info
var billingAddress = request.Customer.BillingAddress;
if (billingAddress != null)
- model.OrderReviewData.BillingAddress = await _mediator.Send(new GetAddressModel()
- {
+ model.OrderReviewData.BillingAddress = await _mediator.Send(new GetAddressModel() {
Language = request.Language,
Address = billingAddress,
ExcludeProperties = false,
@@ -540,8 +528,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
{
var shippingAddress = request.Customer.ShippingAddress;
if (shippingAddress != null)
- model.OrderReviewData.ShippingAddress = await _mediator.Send(new GetAddressModel()
- {
+ model.OrderReviewData.ShippingAddress = await _mediator.Send(new GetAddressModel() {
Language = request.Language,
Address = shippingAddress,
ExcludeProperties = false,
@@ -553,8 +540,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
if (pickup != null)
{
var country = await _countryService.GetCountryById(pickup.Address.CountryId);
- model.OrderReviewData.PickupAddress = new AddressModel
- {
+ model.OrderReviewData.PickupAddress = new AddressModel {
Address1 = pickup.Address.Address1,
City = pickup.Address.City,
CountryName = country != null ? country.Name : string.Empty,
@@ -583,8 +569,7 @@ namespace Grand.Web.Features.Handlers.ShoppingCart
private async Task<PictureModel> PrepareCartItemPicture(Product product, IList<CustomAttribute> attributes)
{
var sciPicture = await product.GetProductPicture(attributes, _productService, _pictureService, _productAttributeParser);
- return new PictureModel
- {
+ return new PictureModel {
Id = sciPicture?.Id,
ImageUrl = await _pictureService.GetPictureUrl(sciPicture, _mediaSettings.CartThumbPictureSize, true),
Title = string.Format(_translationService.GetResource("Media.Product.ImageLinkTitleFormat"), product.Name),