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.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Improvements - Grand.Web - Product pictures - use localizable alternate text and title attributes for a picture
KrzysztofPajak7574ca4af04f
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.csindex e60d63801..7ed6bde20 100644--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs@@ -264,8 +264,7 @@ namespace Grand.Web.Features.Handlers.Products#region Product specifications- model.ProductSpecifications = await _mediator.Send(new GetProductSpecification()- {+ model.ProductSpecifications = await _mediator.Send(new GetProductSpecification() {Language = _workContext.WorkingLanguage,Product = product});@@ -274,8 +273,7 @@ namespace Grand.Web.Features.Handlers.Products#region Product review overview- model.ProductReviewOverview = await _mediator.Send(new GetProductReviewOverview()- {+ model.ProductReviewOverview = await _mediator.Send(new GetProductReviewOverview() {Product = product,Language = _workContext.WorkingLanguage,Store = _workContext.CurrentStore@@ -299,16 +297,16 @@ namespace Grand.Web.Features.Handlers.Products_workContext.WorkingLanguage.Id,string.Join(",", _workContext.CurrentCustomer.GetCustomerGroupIds()),_workContext.CurrentStore.Id);- model.ProductCollections = await _cacheBase.GetAsync(collectionsCacheKey, async () =>+ model.ProductCollections = await _cacheBase.GetAsync(collectionsCacheKey, async () =>+ {+ var listCollection = new List<CollectionModel>();+ foreach (var item in product.ProductCollections.OrderBy(x => x.DisplayOrder)){- var listCollection = new List<CollectionModel>();- foreach (var item in product.ProductCollections.OrderBy(x=>x.DisplayOrder))- {- var collect = (await _collectionService.GetCollectionById(item.CollectionId)).ToModel(_workContext.WorkingLanguage);- listCollection.Add(collect);- }- return listCollection;- });+ var collect = (await _collectionService.GetCollectionById(item.CollectionId)).ToModel(_workContext.WorkingLanguage);+ listCollection.Add(collect);+ }+ return listCollection;+ });#endregion@@ -363,8 +361,7 @@ namespace Grand.Web.Features.Handlers.Productsvar warehouseId = updateCartItem != null ? updateCartItem.WarehouseId : _workContext.CurrentStore.DefaultWarehouseId;- var model = new ProductDetailsModel- {+ var model = new ProductDetailsModel {Id = product.Id,ProductType = product.ProductTypeId,Name = product.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),@@ -411,8 +408,7 @@ namespace Grand.Web.Features.Handlers.Productsforeach (var warehouse in await _warehouseService.GetAllWarehouses()){var productwarehouse = product.ProductWarehouseInventory.FirstOrDefault(x => x.WarehouseId == warehouse.Id);- model.ProductWarehouses.Add(new ProductDetailsModel.ProductWarehouseModel- {+ model.ProductWarehouses.Add(new ProductDetailsModel.ProductWarehouseModel {Use = productwarehouse != null,StockQuantity = productwarehouse?.StockQuantity ?? 0,ReservedQuantity = productwarehouse?.ReservedQuantity ?? 0,@@ -447,7 +443,7 @@ namespace Grand.Web.Features.Handlers.Products//store namemodel.CurrentStoreName = _workContext.CurrentStore.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id);-+return model;#endregion@@ -457,8 +453,7 @@ namespace Grand.Web.Features.Handlers.Products{var customer = _workContext.CurrentCustomer;- var model = new ProductAskQuestionSimpleModel- {+ var model = new ProductAskQuestionSimpleModel {Id = product.Id,AskQuestionEmail = customer.Email,AskQuestionFullName = customer.GetFullName(),@@ -475,8 +470,7 @@ namespace Grand.Web.Features.Handlers.Productsvar brand = await _brandService.GetBrandById(product.BrandId);if (brand != null && brand.Published){- return new BrandBriefInfoModel- {+ return new BrandBriefInfoModel {Id = brand.Id,Name = brand.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),SeName = brand.GetSeName(_workContext.WorkingLanguage.Id),@@ -492,8 +486,7 @@ namespace Grand.Web.Features.Handlers.Productsvar vendor = await _vendorService.GetVendorById(product.VendorId);if (vendor != null && !vendor.Deleted && vendor.Active){- return new VendorBriefInfoModel- {+ return new VendorBriefInfoModel {Id = vendor.Id,Name = vendor.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),SeName = vendor.GetSeName(_workContext.WorkingLanguage.Id),@@ -512,8 +505,7 @@ namespace Grand.Web.Features.Handlers.Products_workContext.CurrentStore.Id);return await _cacheBase.GetAsync(breadcrumbCacheKey, async () =>{- var breadcrumbModel = new ProductDetailsModel.ProductBreadcrumbModel- {+ var breadcrumbModel = new ProductDetailsModel.ProductBreadcrumbModel {Enabled = _catalogSettings.CategoryBreadcrumbEnabled,ProductId = product.Id,@@ -528,8 +520,7 @@ namespace Grand.Web.Features.Handlers.Products{foreach (var catBr in await _categoryService.GetCategoryBreadCrumb(category)){- breadcrumbModel.CategoryBreadcrumb.Add(new CategorySimpleModel- {+ breadcrumbModel.CategoryBreadcrumb.Add(new CategorySimpleModel {Id = catBr.Id,Name = catBr.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),SeName = catBr.GetSeName(_workContext.WorkingLanguage.Id),@@ -553,8 +544,7 @@ namespace Grand.Web.Features.Handlers.Productsvar tag = await _productTagService.GetProductTagByName(item);if (tag != null){- tags.Add(new ProductTagModel()- {+ tags.Add(new ProductTagModel() {Id = tag.Id,Name = tag.GetTranslation(y => y.Name, _workContext.WorkingLanguage.Id),SeName = tag.SeName,@@ -573,20 +563,19 @@ namespace Grand.Web.Features.Handlers.ProductsdefaultPicture = new ProductPicture();var picture = await _pictureService.GetPictureById(defaultPicture.PictureId);-- var defaultPictureModel = new PictureModel- {++ var defaultPictureModel = new PictureModel {Id = defaultPicture.PictureId,ImageUrl = await _pictureService.GetPictureUrl(defaultPicture.PictureId, defaultPictureSize, !isAssociatedProduct),FullSizeImageUrl = await _pictureService.GetPictureUrl(defaultPicture.PictureId, 0, !isAssociatedProduct),};//"title" attribute- defaultPictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.TitleAttribute)) ?- picture.TitleAttribute :+ defaultPictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id))) ?+ picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id) :string.Format(_translationService.GetResource("Media.Product.ImageLinkTitleFormat.Details"), name);//"alt" attribute- defaultPictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.AltAttribute)) ?- picture.AltAttribute :+ defaultPictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.AltAttribute, _workContext.WorkingLanguage.Id))) ?+ picture.GetTranslation(x => x.AltAttribute, _workContext.WorkingLanguage.Id) :string.Format(_translationService.GetResource("Media.Product.ImageAlternateTextFormat.Details"), name);//all pictures@@ -596,22 +585,19 @@ namespace Grand.Web.Features.Handlers.Productspicture = await _pictureService.GetPictureById(productPicture.PictureId);if (picture != null){- var pictureModel = new PictureModel- {+ var pictureModel = new PictureModel {Id = productPicture.PictureId,ThumbImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId, _mediaSettings.ProductThumbPictureSizeOnProductDetailsPage),ImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId, _mediaSettings.ProductDetailsPictureSize),FullSizeImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId),- Title = string.Format(_translationService.GetResource("Media.Product.ImageLinkTitleFormat.Details"), name),- AlternateText = string.Format(_translationService.GetResource("Media.Product.ImageAlternateTextFormat.Details"), name),};//"title" attribute- pictureModel.Title = !string.IsNullOrEmpty(picture.TitleAttribute) ?- picture.TitleAttribute :+ pictureModel.Title = !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id)) ?+ picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id) :string.Format(_translationService.GetResource("Media.Product.ImageLinkTitleFormat.Details"), name);//"alt" attribute- pictureModel.AlternateText = !string.IsNullOrEmpty(picture.AltAttribute) ?- picture.AltAttribute :+ pictureModel.AlternateText = !string.IsNullOrEmpty(picture.GetTranslation(x => x.AltAttribute, _workContext.WorkingLanguage.Id)) ?+ picture.GetTranslation(x => x.AltAttribute, _workContext.WorkingLanguage.Id) :string.Format(_translationService.GetResource("Media.Product.ImageAlternateTextFormat.Details"), name);pictureModels.Add(pictureModel);@@ -725,8 +711,7 @@ namespace Grand.Web.Features.Handlers.Productsvar allowedQuantities = product.ParseAllowedQuantities();foreach (var qty in allowedQuantities){- model.AllowedQuantities.Add(new SelectListItem- {+ model.AllowedQuantities.Add(new SelectListItem {Text = qty.ToString(),Value = qty.ToString(),Selected = updatecartitem != null && updatecartitem.Quantity == qty@@ -812,8 +797,7 @@ namespace Grand.Web.Features.Handlers.Productsif (productAttribute == null)continue;- var attributeModel = new ProductDetailsModel.ProductAttributeModel- {+ var attributeModel = new ProductDetailsModel.ProductAttributeModel {Id = attribute.Id,ProductId = product.Id,ProductAttributeId = attribute.ProductAttributeId,@@ -853,8 +837,7 @@ namespace Grand.Web.Features.Handlers.Productsvar customattributes = _productAttributeParser.AddProductAttribute(null, attribute, attributeValue.Id);stockAvailability = _stockQuantityService.FormatStockMessage(product, string.Empty, customattributes);}- var valueModel = new ProductDetailsModel.ProductAttributeValueModel- {+ var valueModel = new ProductDetailsModel.ProductAttributeValueModel {Id = attributeValue.Id,Name = attributeValue.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),ColorSquaresRgb = attributeValue.ColorSquaresRgb, //used with "Color squares" attribute type@@ -884,8 +867,7 @@ namespace Grand.Web.Features.Handlers.Productsvar pm = new PictureModel();if (attributeValue.ImageSquaresPictureId != null){- pm = new PictureModel- {+ pm = new PictureModel {Id = attributeValue.ImageSquaresPictureId,FullSizeImageUrl = await _pictureService.GetPictureUrl(attributeValue.ImageSquaresPictureId),ImageUrl = await _pictureService.GetPictureUrl(attributeValue.ImageSquaresPictureId, _mediaSettings.ImageSquarePictureSize)@@ -900,8 +882,7 @@ namespace Grand.Web.Features.Handlers.Productsvar pm = new PictureModel();if (attributeValue.PictureId != null){- pm = new PictureModel- {+ pm = new PictureModel {Id = attributeValue.PictureId,FullSizeImageUrl = await _pictureService.GetPictureUrl(attributeValue.PictureId),ImageUrl = await _pictureService.GetPictureUrl(attributeValue.PictureId, defaultPictureSize)@@ -1078,8 +1059,7 @@ namespace Grand.Web.Features.Handlers.Productsvar p1 = await _productService.GetProductById(bundle.ProductId);if (p1 != null && p1.Published && p1.IsAvailable()){- var bundleProduct = new ProductDetailsModel.ProductBundleModel()- {+ var bundleProduct = new ProductDetailsModel.ProductBundleModel() {ProductId = p1.Id,Name = p1.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),ShortDescription = p1.GetTranslation(x => x.ShortDescription, _workContext.WorkingLanguage.Id),@@ -1105,8 +1085,7 @@ namespace Grand.Web.Features.Handlers.Productsvar picture = await _pictureService.GetPictureById(productPicture.PictureId);- var pictureModel = new PictureModel- {+ var pictureModel = new PictureModel {Id = productPicture.PictureId,ImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId, _mediaSettings.ProductBundlePictureSize),FullSizeImageUrl = await _pictureService.GetPictureUrl(productPicture.PictureId)diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.csindex 066d7f99b..86445faae 100644--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs@@ -440,12 +440,12 @@ namespace Grand.Web.Features.Handlers.ProductsFullSizeImageUrl = await _pictureService.GetPictureUrl(productpicture.PictureId)};//"title" attribute- pictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.TitleAttribute)) ?- picture.TitleAttribute :+ pictureModel.Title = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id))) ?+ picture.GetTranslation(x => x.TitleAttribute, _workContext.WorkingLanguage.Id) :string.Format(res["Media.Product.ImageLinkTitleFormat"], name);//"alt" attribute- pictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.AltAttribute)) ?- picture.AltAttribute :+ pictureModel.AlternateText = (picture != null && !string.IsNullOrEmpty(picture.GetTranslation(x => x.AltAttribute, _workContext.WorkingLanguage.Id))) ?+ picture.GetTranslation(x => x.AltAttribute, _workContext.WorkingLanguage.Id) :string.Format(res["Media.Product.ImageAlternateTextFormat"], name);return pictureModel;