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.

Minor changes

KrzysztofPajakbbfa6ab2d145
diff --git a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
index 418755606..eef0f087c 100644
--- a/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
+++ b/src/Business/Grand.Business.Checkout/Services/Orders/ShoppingCartValidator.cs
@@ -405,11 +405,14 @@ namespace Grand.Business.Checkout.Services.Orders
if (!found)
{
var paa = await _productAttributeService.GetProductAttributeById(a2.ProductAttributeId);
- var notFoundWarning = !string.IsNullOrEmpty(a2.TextPrompt) ?
- a2.TextPrompt :
- string.Format(_translationService.GetResource("ShoppingCart.SelectAttribute"), paa.GetTranslation(a => a.Name, _workContext.WorkingLanguage.Id));
+ if (paa != null)
+ {
+ var notFoundWarning = !string.IsNullOrEmpty(a2.TextPrompt) ?
+ a2.TextPrompt :
+ string.Format(_translationService.GetResource("ShoppingCart.SelectAttribute"), paa.GetTranslation(a => a.Name, _workContext.WorkingLanguage.Id));
- warnings.Add(notFoundWarning);
+ warnings.Add(notFoundWarning);
+ }
}
}
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
index 56b5e3456..908ab0d8d 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
@@ -809,6 +809,9 @@ namespace Grand.Web.Features.Handlers.Products
foreach (var attribute in productAttributeMapping.OrderBy(x => x.DisplayOrder))
{
var productAttribute = await _productAttributeService.GetProductAttributeById(attribute.ProductAttributeId);
+ if (productAttribute == null)
+ continue;
+
var attributeModel = new ProductDetailsModel.ProductAttributeModel
{
Id = attribute.Id,