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.

Add IsDefault property to ProductPicture

KrzysztofPajaka8b9ec75964a
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
index 5c7d2cf6c..2f4b76f38 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/AddProductPictureCommandHandler.cs
@@ -31,7 +31,8 @@ public class AddProductPictureCommandHandler : IRequestHandler<AddProductPicture
await _productService.InsertProductPicture(new ProductPicture {
PictureId = picture.Id,
- DisplayOrder = request.Model.DisplayOrder
+ DisplayOrder = request.Model.DisplayOrder,
+ IsDefault = request.Model.IsDefault
}, product.Id);
return true;
diff --git a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
index acc715e5f..54a014aae 100644
--- a/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
+++ b/src/API/Grand.Api/Commands/Handlers/Catalog/UpdateProductPictureCommandHandler.cs
@@ -21,6 +21,7 @@ public class UpdateProductPictureCommandHandler : IRequestHandler<UpdateProductP
if (pp != null)
{
pp.DisplayOrder = request.Model.DisplayOrder;
+ pp.IsDefault = request.Model.IsDefault;
await _productService.UpdateProductPicture(pp, request.Product.Id);
}
diff --git a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs b/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
index 1e13d7562..2e176c15c 100644
--- a/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
+++ b/src/API/Grand.Api/DTOs/Catalog/ProductPictureDto.cs
@@ -7,4 +7,6 @@ public class ProductPictureDto
[Key] public string PictureId { get; set; }
public int DisplayOrder { get; set; }
+
+ public bool IsDefault { get; set; }
}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
index 129d95cfe..a205aa3a5 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
+++ b/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
@@ -38,7 +38,9 @@ public class GetShoppingCartTokensCommandHandler : IRequestHandler<GetShoppingCa
if (product.ProductPictures.Any())
pictureUrl = await _pictureService.GetPictureUrl(
- product.ProductPictures.MinBy(x => x.DisplayOrder)?.PictureId, 100,
+ product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault()?.PictureId, 100,
storeLocation: request.Store.SslEnabled ? request.Store.SecureUrl : request.Store.Url);
//attributes
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
index 2d578e157..fd7003c8a 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
@@ -205,7 +205,8 @@ public partial class InstallationService
var productpicture1 = new ProductPicture {
PictureId = picture1.Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
};
var productpicture2 = new ProductPicture {
PictureId = picture2.Id,
@@ -256,7 +257,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_sony_ps5_pad_1.png"), "image/png",
pictureService.GetPictureSeName(productSonyPS5Pad.Name), reference: Reference.Product,
objectId: productSonyPS5Pad.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productSonyPS5Pad.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -307,7 +309,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_lenovo_ideapad_dual_1.png"), "image/png",
pictureService.GetPictureSeName(productLenovoIdeaPadDual.Name), reference: Reference.Product,
objectId: productLenovoIdeaPadDual.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLenovoIdeaPadDual.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -398,7 +401,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_mi_notebook_1.png"), "image/png",
pictureService.GetPictureSeName(productMiNotebook.Name), reference: Reference.Product,
objectId: productMiNotebook.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productMiNotebook.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -492,7 +496,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_lenovo_legion_y740_1.png"), "image/png",
pictureService.GetPictureSeName(productLenovoLegionY740.Name), reference: Reference.Product,
objectId: productLenovoLegionY740.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLenovoLegionY740.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -586,7 +591,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_ps5_camera_1.png"), "image/png",
pictureService.GetPictureSeName(productPs5Camera.Name), reference: Reference.Product,
objectId: productPs5Camera.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productPs5Camera.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -679,7 +685,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_acer_nitro_1.png"), "image/png",
pictureService.GetPictureSeName(productAcerNitro.Name), reference: Reference.Product,
objectId: productAcerNitro.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productAcerNitro.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -774,7 +781,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_dell_g5_1.png"), "image/png",
pictureService.GetPictureSeName(productDellG5.Name), reference: Reference.Product,
objectId: productDellG5.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productDellG5.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -849,7 +857,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_dell_xps_1.png"), "image/png",
pictureService.GetPictureSeName(productDellXPS.Name), reference: Reference.Product,
objectId: productDellXPS.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productDellXPS.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -904,7 +913,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_lenovo_yoga_duet_1.png"), "image/png",
pictureService.GetPictureSeName(productLenovoYogaDuet.Name), reference: Reference.Product,
objectId: productLenovoYogaDuet.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLenovoYogaDuet.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -955,7 +965,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_lenovo_smart_tab_1.png"), "image/png",
pictureService.GetPictureSeName(productLenovoSmartTab.Name), reference: Reference.Product,
objectId: productLenovoSmartTab.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLenovoSmartTab.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1006,7 +1017,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_asus_mixed_reality_1.png"), "image/png",
pictureService.GetPictureSeName(productAsusMixedReality.Name), reference: Reference.Product,
objectId: productAsusMixedReality.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productAsusMixedReality.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1061,7 +1073,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_acer_projector_1.png"), "image/png",
pictureService.GetPictureSeName(productAcerProjector.Name), reference: Reference.Product,
objectId: productAcerProjector.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productAcerProjector.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1113,7 +1126,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_acer_monitor_1.png"), "image/png",
pictureService.GetPictureSeName(productAcerMonitor.Name), reference: Reference.Product,
objectId: productAcerMonitor.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productAcerMonitor.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1172,7 +1186,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_Redmi_K30.png"), "image/png",
pictureService.GetPictureSeName(productRedmiK30.Name), reference: Reference.Product,
objectId: productRedmiK30.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productRedmiK30);
@@ -1218,7 +1233,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_Redmi_Note_9_1.png"), "image/png",
pictureService.GetPictureSeName(productRedmiNote9.Name), reference: Reference.Product,
objectId: productRedmiNote9.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productRedmiNote9.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1271,7 +1287,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_POCO_F2_Pro.png"), "image/png",
pictureService.GetPictureSeName(productPocoF2Pro.Name), reference: Reference.Product,
objectId: productPocoF2Pro.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productPocoF2Pro);
@@ -1338,7 +1355,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_Mi_Smart_Band_3i_1.png"), "image/png",
pictureService.GetPictureSeName(productMiSmartBand.Name), reference: Reference.Product,
objectId: productMiSmartBand.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productMiSmartBand.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1389,7 +1407,8 @@ public partial class InstallationService
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_ps4_1.png"),
"image/png", pictureService.GetPictureSeName(productPs4.Name), reference: Reference.Product,
objectId: productPs4.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productPs4.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_ps4_2.png"),
@@ -1441,7 +1460,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_mi_beard_1.png"), "image/png",
pictureService.GetPictureSeName(productMiBeard.Name), reference: Reference.Product,
objectId: productMiBeard.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productMiBeard.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1543,7 +1563,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_predator_1.png"), "image/png",
pictureService.GetPictureSeName(productAdidasPredator.Name), reference: Reference.Product,
objectId: productAdidasPredator.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productAdidasPredator);
@@ -1643,7 +1664,8 @@ public partial class InstallationService
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_adidas.png"),
"image/png", pictureService.GetPictureSeName(productAdidasNitrocharge.Name),
reference: Reference.Product, objectId: productAdidasNitrocharge.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productAdidasNitrocharge.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -1725,7 +1747,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_adidasturfs.png"), "image/png",
pictureService.GetPictureSeName(productAdidasTurfs.Name), reference: Reference.Product,
objectId: productAdidasTurfs.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productAdidasTurfs);
@@ -1821,7 +1844,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_derby_awayshirt_1.png"), "image/png",
pictureService.GetPictureSeName("Derby County Away Shirt"), reference: Reference.Product,
objectId: productDerbyKit_associated_1.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productDerbyKit_associated_1);
var productDerbyKit_associated_2 = new Product {
@@ -1944,7 +1968,8 @@ public partial class InstallationService
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_kidskit.png"),
"image/png", pictureService.GetPictureSeName(productNikeKids.Name), reference: Reference.Product,
objectId: productNikeKids.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productNikeKids);
@@ -2000,7 +2025,8 @@ public partial class InstallationService
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_psg_1.png"),
"image/png", pictureService.GetPictureSeName(productPsgKit.Name), reference: Reference.Product,
objectId: productPsgKit.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productPsgKit.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_psg_2.png"),
@@ -2058,7 +2084,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_derby_shirt_1.png"), "image/png",
pictureService.GetPictureSeName(productDerbyShirt.Name), reference: Reference.Product,
objectId: productDerbyShirt.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productDerbyShirt);
@@ -2101,7 +2128,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_derby_shorts_1.png"), "image/png",
pictureService.GetPictureSeName(productDerbyShorts.Name), reference: Reference.Product,
objectId: productDerbyShorts.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productDerbyShorts);
@@ -2144,7 +2172,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_derby_shirt_1.png"), "image/png",
pictureService.GetPictureSeName(productDerbyKitHome.Name), reference: Reference.Product,
objectId: productDerbyKitHome.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productDerbyKitHome);
@@ -2204,7 +2233,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_chicago_jersey_1.png"), "image/png",
pictureService.GetPictureSeName(productChicagoBulls.Name), reference: Reference.Product,
objectId: productChicagoBulls.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productChicagoBulls.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -2288,7 +2318,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_vivoactive.png"), "image/png",
pictureService.GetPictureSeName(productVivoactive.Name), reference: Reference.Product,
objectId: productVivoactive.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productVivoactive);
@@ -2333,7 +2364,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_garmin_fenix_1.png"), "image/png",
pictureService.GetPictureSeName(productGarminFenix.Name), reference: Reference.Product,
objectId: productGarminFenix.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productGarminFenix.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -2385,7 +2417,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_forerunner.png"), "image/png",
pictureService.GetPictureSeName(productForerunner.Name), reference: Reference.Product,
objectId: productForerunner.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productForerunner);
@@ -2517,7 +2550,8 @@ public partial class InstallationService
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_gta_1.png"),
"image/png", pictureService.GetPictureSeName(productGTA.Name), reference: Reference.Product,
objectId: productGTA.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productGTA);
@@ -2620,7 +2654,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_lego_falcon_1.png"), "image/png",
pictureService.GetPictureSeName(productLegoFalcon.Name), reference: Reference.Product,
objectId: productLegoFalcon.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLegoFalcon.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -2673,7 +2708,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_lego_hogwarts_1.png"), "image/png",
pictureService.GetPictureSeName(productLegoHogwarts.Name), reference: Reference.Product,
objectId: productLegoHogwarts.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLegoHogwarts.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -2725,7 +2761,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_LegoCity_1.png"), "image/png",
pictureService.GetPictureSeName(productLegoCity.Name), reference: Reference.Product,
objectId: productLegoCity.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productLegoCity.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
@@ -2781,7 +2818,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_adidasball.png"), "image/png",
pictureService.GetPictureSeName(productAdidasBall.Name), reference: Reference.Product,
objectId: productAdidasBall.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productAdidasBall);
@@ -2826,7 +2864,8 @@ public partial class InstallationService
PictureId = (await pictureService.InsertPicture(File.ReadAllBytes(sampleImagesPath + "product_mikasa.png"),
"image/png", pictureService.GetPictureSeName(productMikasa.Name), reference: Reference.Product,
objectId: productMikasa.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productMikasa);
@@ -2871,7 +2910,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_spalding.png"), "image/png",
pictureService.GetPictureSeName(productSpalding.Name), reference: Reference.Product,
objectId: productSpalding.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(productSpalding);
@@ -2913,7 +2953,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_25giftcart.png"), "image/png",
pictureService.GetPictureSeName(product25GiftVoucher.Name), reference: Reference.Product,
objectId: product25GiftVoucher.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(product25GiftVoucher);
@@ -2959,7 +3000,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_50giftcart.png"), "image/png",
pictureService.GetPictureSeName(product50GiftVoucher.Name), reference: Reference.Product,
objectId: product50GiftVoucher.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(product50GiftVoucher);
@@ -3003,7 +3045,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_100giftcart.png"), "image/png",
pictureService.GetPictureSeName(product100GiftVoucher.Name), reference: Reference.Product,
objectId: product100GiftVoucher.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
await _productRepository.InsertAsync(product100GiftVoucher);
@@ -3048,7 +3091,8 @@ public partial class InstallationService
File.ReadAllBytes(sampleImagesPath + "product_sony_ps5_console_1.png"), "image/png",
pictureService.GetPictureSeName(productPlaystationBundlePack.Name), reference: Reference.Product,
objectId: productPlaystationBundlePack.Id)).Id,
- DisplayOrder = 1
+ DisplayOrder = 1,
+ IsDefault = true
});
productPlaystationBundlePack.ProductPictures.Add(new ProductPicture {
PictureId = (await pictureService.InsertPicture(
diff --git a/src/Core/Grand.Domain/Catalog/ProductPicture.cs b/src/Core/Grand.Domain/Catalog/ProductPicture.cs
index 2628d4272..61cd414c3 100644
--- a/src/Core/Grand.Domain/Catalog/ProductPicture.cs
+++ b/src/Core/Grand.Domain/Catalog/ProductPicture.cs
@@ -14,4 +14,9 @@ public class ProductPicture : SubBaseEntity
/// Gets or sets the display order
/// </summary>
public int DisplayOrder { get; set; }
+
+ /// <summary>
+ /// Gets or sets the default picture
+ /// </summary>
+ public bool IsDefault { get; set; }
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml
index 22aeb0f66..74961f433 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml
@@ -51,6 +51,7 @@
fields: {
PictureUrl: {editable: false, type: "string" },
DisplayOrder: {editable: true, type: "number" },
+ IsDefault: { editable: true, type: "boolean" },
AltAttribute: {editable: true, type: "string" },
TitleAttribute: {editable: true, type: "string" }
}
@@ -87,7 +88,16 @@
title: "@Loc["Admin.Catalog.Products.Pictures.Fields.Picture"]",
template: "<a class='k-link editpicture' href=\"@Url.Action("ProductPicturePopup", "Product", new { area = Constants.AreaAdmin })/?productId=@(Model.Id)&Id=#=Id#&btnId=btnRefreshProductPictures&formId=product-form\"><img alt='#=PictureId#' src='#=PictureUrl#' width='150' /></a>",
width: 165
- }, {
+ },
+ {
+ field: "IsDefault",
+ title: "@Loc["Admin.Catalog.Products.Pictures.Fields.IsDefault"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(IsDefault) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ },
+ {
field: "DisplayOrder",
title: "@Loc["Admin.Catalog.Products.Pictures.Fields.DisplayOrder"]",
minScreenWidth: 750,
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
index d1b314259..d0c50a205 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/ProductPicturePopup.cshtml
@@ -81,6 +81,16 @@
<span asp-validation-for="DisplayOrder"></span>
</div>
</div>
+ <div class="form-group">
+ <admin-label asp-for="IsDefault"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IsDefault"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IsDefault"></span>
+ </div>
+ </div>
<div class="form-group">
<admin-label asp-for="Style"/>
<div class="col-md-9 col-sm-9">
diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
index b3c09eca8..a83186d7d 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs
@@ -332,7 +332,8 @@ public class ProductController : BaseAdminController
await _productService.InsertProductPicture(new ProductPicture {
PictureId = pictureCopy.Id,
- DisplayOrder = productPicture.DisplayOrder
+ DisplayOrder = productPicture.DisplayOrder,
+ IsDefault = productPicture.IsDefault
}, newProduct.Id);
}
}
diff --git a/src/Web/Grand.Web.Admin/Extensions/ProductExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/ProductExtensions.cs
deleted file mode 100644
index 6dd64383e..000000000
--- a/src/Web/Grand.Web.Admin/Extensions/ProductExtensions.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Core.Interfaces.Storage;
-using Grand.Domain.Catalog;
-using Grand.Domain.Common;
-using Grand.Domain.Media;
-
-namespace Grand.Web.Admin.Extensions;
-
-public static class ProductExtensions
-{
- /// <summary>
- /// Get product picture (for shopping cart and order details pages)
- /// </summary>
- /// <param name="product">Product</param>
- /// <param name="attributes">Attributes</param>
- /// <param name="productService">Product service</param>
- /// <param name="pictureService">Picture service</param>
- /// <returns>Picture</returns>
- public static async Task<Picture> GetProductPicture(this Product product, IList<CustomAttribute> attributes,
- IProductService productService, IPictureService pictureService)
- {
- ArgumentNullException.ThrowIfNull(product);
- ArgumentNullException.ThrowIfNull(pictureService);
-
- Picture picture = null;
-
- if (attributes != null && attributes.Any())
- {
- var comb = product.FindProductAttributeCombination(attributes);
- if (comb != null)
- if (!string.IsNullOrEmpty(comb.PictureId))
- {
- var combPicture = await pictureService.GetPictureById(comb.PictureId);
- if (combPicture != null) picture = combPicture;
- }
-
- if (picture == null)
- {
- var attributeValues = product.ParseProductAttributeValues(attributes);
- foreach (var attributeValue in attributeValues)
- {
- var attributePicture = await pictureService.GetPictureById(attributeValue.PictureId);
- if (attributePicture != null)
- {
- picture = attributePicture;
- break;
- }
- }
- }
- }
-
- if (picture == null)
- {
- var pp = product.ProductPictures.MinBy(x => x.DisplayOrder);
- if (pp != null)
- picture = await pictureService.GetPictureById(pp.PictureId);
- }
-
- if (picture == null && !product.VisibleIndividually && !string.IsNullOrEmpty(product.ParentGroupedProductId))
- {
- var parentProduct = await productService.GetProductById(product.ParentGroupedProductId);
- if (parentProduct != null)
- if (parentProduct.ProductPictures.Any())
- picture = await pictureService.GetPictureById(parentProduct.ProductPictures.FirstOrDefault()
- .PictureId);
- }
-
- return picture;
- }
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
index ee8fb8480..64bf86127 100644
--- a/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Catalog/ProductModel.cs
@@ -491,6 +491,9 @@ public class ProductModel : BaseEntityModel, ILocalizedModel<ProductLocalizedMod
[GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.DisplayOrder")]
public int DisplayOrder { get; set; }
+
+ [GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.IsDefault")]
+ public bool IsDefault { get; set; }
[GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.OverrideAltAttribute")]
public string AltAttribute { get; set; }
diff --git a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
index 38d4fe68e..0dd3a3bc4 100644
--- a/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/OrderViewModelService.cs
@@ -19,12 +19,12 @@ using Grand.Business.Core.Queries.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Directory;
+using Grand.Domain.Media;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
using Grand.Domain.Tax;
using Grand.Infrastructure;
-using Grand.Web.Admin.Extensions;
using Grand.Web.Admin.Extensions.Mapping;
using Grand.Web.Admin.Interfaces;
using Grand.Web.Admin.Models.Orders;
@@ -38,6 +38,47 @@ namespace Grand.Web.Admin.Services;
public class OrderViewModelService : IOrderViewModelService
{
+
+ #region Fields
+
+ private readonly IOrderService _orderService;
+ private readonly IPricingService _pricingService;
+ private readonly IDateTimeService _dateTimeService;
+ private readonly IPriceFormatter _priceFormatter;
+ private readonly IDiscountService _discountService;
+ private readonly ITranslationService _translationService;
+ private readonly IWorkContext _workContext;
+ private readonly ICurrencyService _currencyService;
+ private readonly IPaymentService _paymentService;
+ private readonly IPaymentTransactionService _paymentTransactionService;
+ private readonly ICountryService _countryService;
+ private readonly IProductService _productService;
+ private readonly IMessageProviderService _messageProviderService;
+ private readonly IProductAttributeService _productAttributeService;
+ private readonly IGiftVoucherService _giftVoucherService;
+ private readonly IDownloadService _downloadService;
+ private readonly IStoreService _storeService;
+ private readonly IVendorService _vendorService;
+ private readonly ISalesEmployeeService _salesEmployeeService;
+ private readonly IAddressAttributeParser _addressAttributeParser;
+ private readonly IAddressAttributeService _addressAttributeService;
+ private readonly IAffiliateService _affiliateService;
+ private readonly IPictureService _pictureService;
+ private readonly ITaxService _taxService;
+ private readonly IMerchandiseReturnService _merchandiseReturnService;
+ private readonly ICustomerService _customerService;
+ private readonly IWarehouseService _warehouseService;
+ private readonly IProductAttributeFormatter _productAttributeFormatter;
+ private readonly IShoppingCartValidator _shoppingCartValidator;
+ private readonly CurrencySettings _currencySettings;
+ private readonly TaxSettings _taxSettings;
+ private readonly AddressSettings _addressSettings;
+ private readonly IOrderTagService _orderTagService;
+ private readonly IOrderStatusService _orderStatusService;
+ private readonly IMediator _mediator;
+
+ #endregion
+
#region Ctor
public OrderViewModelService(IOrderService orderService,
@@ -683,8 +724,7 @@ public class OrderViewModelService : IOrderViewModelService
IsDownloadActivated = orderItem.IsDownloadActivated
};
//picture
- var orderItemPicture =
- await product.GetProductPicture(orderItem.Attributes, _productService, _pictureService);
+ var orderItemPicture = await GetProductPicture(product, orderItem.Attributes);
orderItemModel.PictureThumbnailUrl = await _pictureService.GetPictureUrl(orderItemPicture, 75);
//license file
@@ -1235,43 +1275,44 @@ public class OrderViewModelService : IOrderViewModelService
return result;
}
- #region Fields
+ private async Task<Picture> GetProductPicture(Product product, IList<CustomAttribute> attributes)
+ {
+ ArgumentNullException.ThrowIfNull(product);
- private readonly IOrderService _orderService;
- private readonly IPricingService _pricingService;
- private readonly IDateTimeService _dateTimeService;
- private readonly IPriceFormatter _priceFormatter;
- private readonly IDiscountService _discountService;
- private readonly ITranslationService _translationService;
- private readonly IWorkContext _workContext;
- private readonly ICurrencyService _currencyService;
- private readonly IPaymentService _paymentService;
- private readonly IPaymentTransactionService _paymentTransactionService;
- private readonly ICountryService _countryService;
- private readonly IProductService _productService;
- private readonly IMessageProviderService _messageProviderService;
- private readonly IProductAttributeService _productAttributeService;
- private readonly IGiftVoucherService _giftVoucherService;
- private readonly IDownloadService _downloadService;
- private readonly IStoreService _storeService;
- private readonly IVendorService _vendorService;
- private readonly ISalesEmployeeService _salesEmployeeService;
- private readonly IAddressAttributeParser _addressAttributeParser;
- private readonly IAddressAttributeService _addressAttributeService;
- private readonly IAffiliateService _affiliateService;
- private readonly IPictureService _pictureService;
- private readonly ITaxService _taxService;
- private readonly IMerchandiseReturnService _merchandiseReturnService;
- private readonly ICustomerService _customerService;
- private readonly IWarehouseService _warehouseService;
- private readonly IProductAttributeFormatter _productAttributeFormatter;
- private readonly IShoppingCartValidator _shoppingCartValidator;
- private readonly CurrencySettings _currencySettings;
- private readonly TaxSettings _taxSettings;
- private readonly AddressSettings _addressSettings;
- private readonly IOrderTagService _orderTagService;
- private readonly IOrderStatusService _orderStatusService;
- private readonly IMediator _mediator;
+ Picture picture = null;
- #endregion
+ if (attributes != null && attributes.Any())
+ {
+ var comb = product.FindProductAttributeCombination(attributes);
+ if (comb != null)
+ if (!string.IsNullOrEmpty(comb.PictureId))
+ {
+ var combPicture = await _pictureService.GetPictureById(comb.PictureId);
+ if (combPicture != null) picture = combPicture;
+ }
+
+ if (picture == null)
+ {
+ var attributeValues = product.ParseProductAttributeValues(attributes);
+ foreach (var attributeValue in attributeValues)
+ {
+ var attributePicture = await _pictureService.GetPictureById(attributeValue.PictureId);
+ if (attributePicture != null)
+ {
+ picture = attributePicture;
+ break;
+ }
+ }
+ }
+ }
+ if (picture == null)
+ {
+ var pp = product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault();
+ if (pp != null)
+ picture = await _pictureService.GetPictureById(pp.PictureId);
+ }
+ return picture;
+ }
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
index 7b2ac76c4..0dbcfc1f8 100644
--- a/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Admin/Services/ProductViewModelService.cs
@@ -131,7 +131,8 @@ public class ProductViewModelService(
ProductId = product.Id,
PictureId = picture.PictureId,
PictureUrl = await pictureService.GetPictureUrl(picture.PictureId),
- DisplayOrder = picture.DisplayOrder
+ DisplayOrder = picture.DisplayOrder,
+ IsDefault = picture.IsDefault
});
model.PrimaryStoreCurrencyCode =
(await currencyService.GetCurrencyById(currencySettings.PrimaryStoreCurrencyId))?.CurrencyCode;
@@ -169,7 +170,8 @@ public class ProductViewModelService(
ProductId = product.Id,
PictureId = x.PictureId,
PictureUrl = await pictureService.GetPictureUrl(x.PictureId),
- DisplayOrder = x.DisplayOrder
+ DisplayOrder = x.DisplayOrder,
+ IsDefault = x.IsDefault
});
var associatedProduct = await productService.GetProductById(model.AssociatedProductId);
@@ -1794,7 +1796,8 @@ public class ProductViewModelService(
ProductId = product.Id,
PictureId = x.PictureId,
PictureUrl = await pictureService.GetPictureUrl(x.PictureId),
- DisplayOrder = x.DisplayOrder
+ DisplayOrder = x.DisplayOrder,
+ IsDefault = x.IsDefault
});
return model;
}
@@ -2349,6 +2352,7 @@ public class ProductViewModelService(
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
DisplayOrder = x.DisplayOrder,
+ IsDefault = x.IsDefault,
Style = picture?.Style,
ExtraField = picture?.ExtraField
};
@@ -2370,6 +2374,7 @@ public class ProductViewModelService(
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
DisplayOrder = productPicture.DisplayOrder,
+ IsDefault = productPicture.IsDefault,
Style = picture?.Style,
ExtraField = picture?.ExtraField
};
@@ -2384,12 +2389,12 @@ public class ProductViewModelService(
if (product.ProductPictures.Any(x => x.PictureId == picture.Id))
return;
-
- await productService.InsertProductPicture(new ProductPicture {
+
+ var productPicture = new ProductPicture {
PictureId = picture.Id,
DisplayOrder = displayOrder
- }, product.Id);
-
+ };
+ await productService.InsertProductPicture(productPicture, product.Id);
await pictureService.SetSeoFilename(picture, pictureService.GetPictureSeName(product.Name));
}
@@ -2406,6 +2411,7 @@ public class ProductViewModelService(
throw new ArgumentException("No picture found with the specified id");
productPicture.DisplayOrder = model.DisplayOrder;
+ productPicture.IsDefault = model.IsDefault;
await productService.UpdateProductPicture(productPicture, product.Id);
//Update picture fields
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml
index 8f4f1f0b7..ea70f54d1 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/Partials/CreateOrUpdate.Pictures.cshtml
@@ -51,6 +51,7 @@
fields: {
PictureUrl: {editable: false, type: "string" },
DisplayOrder: {editable: true, type: "number" },
+ IsDefault: { editable: true, type: "boolean" },
AltAttribute: {editable: true, type: "string" },
TitleAttribute: {editable: true, type: "string" }
}
@@ -87,7 +88,16 @@
title: "@Loc["Vendor.Catalog.Products.Pictures.Fields.Picture"]",
template: "<a class='k-link editpicture' href=\"@Url.Action("ProductPicturePopup", "Product", new { area = Constants.AreaVendor })/?productId=@(Model.Id)&Id=#=Id#&btnId=btnRefreshProductPictures&formId=product-form\"><img alt='#=PictureId#' src='#=PictureUrl#' width='150' /></a>",
width: 165
- }, {
+ },
+ {
+ field: "IsDefault",
+ title: "@Loc["Admin.Catalog.Products.Pictures.Fields.IsDefault"]",
+ width: 100,
+ headerAttributes: { style: "text-align:center" },
+ attributes: { style: "text-align:center" },
+ template: '# if(IsDefault) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'
+ },
+ {
field: "DisplayOrder",
title: "@Loc["Vendor.Catalog.Products.Pictures.Fields.DisplayOrder"]",
minScreenWidth: 750,
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml
index 706274973..4ec4b2540 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Product/ProductPicturePopup.cshtml
@@ -81,6 +81,16 @@
<span asp-validation-for="DisplayOrder"></span>
</div>
</div>
+ <div class="form-group">
+ <admin-label asp-for="IsDefault"/>
+ <div class="col-md-9 col-sm-9">
+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+ <admin-input asp-for="IsDefault"/>
+ <div class="control__indicator"></div>
+ </label>
+ <span asp-validation-for="IsDefault"></span>
+ </div>
+ </div>
<div class="form-group">
<admin-label asp-for="Style"/>
<div class="col-md-9 col-sm-9">
diff --git a/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs b/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs
index 1a9cbbc3e..90e92be25 100644
--- a/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs
+++ b/src/Web/Grand.Web.Vendor/Controllers/ProductController.cs
@@ -291,7 +291,8 @@ public class ProductController : BaseVendorController
await _productService.InsertProductPicture(new ProductPicture {
PictureId = pictureCopy.Id,
- DisplayOrder = productPicture.DisplayOrder
+ DisplayOrder = productPicture.DisplayOrder,
+ IsDefault = productPicture.IsDefault
}, newProduct.Id);
}
}
diff --git a/src/Web/Grand.Web.Vendor/Extensions/ProductExtensions.cs b/src/Web/Grand.Web.Vendor/Extensions/ProductExtensions.cs
deleted file mode 100644
index b41b76a19..000000000
--- a/src/Web/Grand.Web.Vendor/Extensions/ProductExtensions.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Grand.Business.Core.Interfaces.Catalog.Products;
-using Grand.Business.Core.Interfaces.Storage;
-using Grand.Domain.Catalog;
-using Grand.Domain.Common;
-using Grand.Domain.Media;
-
-namespace Grand.Web.Vendor.Extensions;
-
-public static class ProductExtensions
-{
- /// <summary>
- /// Get product picture (for shopping cart and order details pages)
- /// </summary>
- /// <param name="product">Product</param>
- /// <param name="attributes">Attributes</param>
- /// <param name="productService">Product service</param>
- /// <param name="pictureService">Picture service</param>
- /// <returns>Picture</returns>
- public static async Task<Picture> GetProductPicture(this Product product, IList<CustomAttribute> attributes,
- IProductService productService, IPictureService pictureService)
- {
- ArgumentNullException.ThrowIfNull(product);
- ArgumentNullException.ThrowIfNull(pictureService);
-
- Picture picture = null;
-
- if (attributes != null && attributes.Any())
- {
- var comb = product.FindProductAttributeCombination(attributes);
- if (comb != null)
- if (!string.IsNullOrEmpty(comb.PictureId))
- {
- var combPicture = await pictureService.GetPictureById(comb.PictureId);
- if (combPicture != null) picture = combPicture;
- }
-
- if (picture == null)
- {
- var attributeValues = product.ParseProductAttributeValues(attributes);
- foreach (var attributeValue in attributeValues)
- {
- var attributePicture = await pictureService.GetPictureById(attributeValue.PictureId);
- if (attributePicture != null)
- {
- picture = attributePicture;
- break;
- }
- }
- }
- }
-
- if (picture == null)
- {
- var pp = product.ProductPictures.MinBy(x => x.DisplayOrder);
- if (pp != null)
- picture = await pictureService.GetPictureById(pp.PictureId);
- }
-
- if (picture == null && !product.VisibleIndividually && !string.IsNullOrEmpty(product.ParentGroupedProductId))
- {
- var parentProduct = await productService.GetProductById(product.ParentGroupedProductId);
- if (parentProduct != null)
- if (parentProduct.ProductPictures.Any())
- picture = await pictureService.GetPictureById(parentProduct.ProductPictures.FirstOrDefault()!
- .PictureId);
- }
-
- return picture;
- }
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs
index 92ae1bb28..9eae35c5f 100644
--- a/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs
+++ b/src/Web/Grand.Web.Vendor/Models/Catalog/ProductModel.cs
@@ -424,7 +424,10 @@ public class ProductModel : BaseEntityModel, ILocalizedModel<ProductLocalizedMod
[GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.DisplayOrder")]
public int DisplayOrder { get; set; }
-
+
+ [GrandResourceDisplayName("Admin.Catalog.Products.Pictures.Fields.IsDefault")]
+ public bool IsDefault { get; set; }
+
[GrandResourceDisplayName("Vendor.Catalog.Products.Pictures.Fields.OverrideAltAttribute")]
public string AltAttribute { get; set; }
diff --git a/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs
index 7d54d1dd6..9d4f9312c 100644
--- a/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs
+++ b/src/Web/Grand.Web.Vendor/Services/OrderViewModelService.cs
@@ -11,8 +11,10 @@ using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Business.Core.Interfaces.Common.Stores;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Core.Interfaces.Storage;
+using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Directory;
+using Grand.Domain.Media;
using Grand.Domain.Orders;
using Grand.Domain.Payments;
using Grand.Domain.Shipping;
@@ -29,6 +31,34 @@ namespace Grand.Web.Vendor.Services;
public class OrderViewModelService : IOrderViewModelService
{
+ #region Fields
+
+ private readonly IOrderService _orderService;
+ private readonly IDateTimeService _dateTimeService;
+ private readonly IPriceFormatter _priceFormatter;
+ private readonly ITranslationService _translationService;
+ private readonly IWorkContext _workContext;
+ private readonly ICurrencyService _currencyService;
+ private readonly IPaymentService _paymentService;
+ private readonly ICountryService _countryService;
+ private readonly IProductService _productService;
+ private readonly IGiftVoucherService _giftVoucherService;
+ private readonly IDownloadService _downloadService;
+ private readonly IStoreService _storeService;
+ private readonly IVendorService _vendorService;
+ private readonly IAddressAttributeParser _addressAttributeParser;
+ private readonly IPictureService _pictureService;
+ private readonly IMerchandiseReturnService _merchandiseReturnService;
+ private readonly ICustomerService _customerService;
+ private readonly IWarehouseService _warehouseService;
+ private readonly CurrencySettings _currencySettings;
+ private readonly TaxSettings _taxSettings;
+ private readonly AddressSettings _addressSettings;
+ private readonly IOrderTagService _orderTagService;
+ private readonly IOrderStatusService _orderStatusService;
+
+ #endregion
+
#region Ctor
public OrderViewModelService(IOrderService orderService,
@@ -426,8 +456,7 @@ public class OrderViewModelService : IOrderViewModelService
IsDownloadActivated = orderItem.IsDownloadActivated
};
//picture
- var orderItemPicture =
- await product.GetProductPicture(orderItem.Attributes, _productService, _pictureService);
+ var orderItemPicture = await GetProductPicture(product, orderItem.Attributes);
orderItemModel.PictureThumbnailUrl = await _pictureService.GetPictureUrl(orderItemPicture, 75);
//license file
@@ -540,31 +569,47 @@ public class OrderViewModelService : IOrderViewModelService
return orders;
}
- #region Fields
+ private async Task<Picture> GetProductPicture(Product product, IList<CustomAttribute> attributes)
+ {
+ ArgumentNullException.ThrowIfNull(product);
- private readonly IOrderService _orderService;
- private readonly IDateTimeService _dateTimeService;
- private readonly IPriceFormatter _priceFormatter;
- private readonly ITranslationService _translationService;
- private readonly IWorkContext _workContext;
- private readonly ICurrencyService _currencyService;
- private readonly IPaymentService _paymentService;
- private readonly ICountryService _countryService;
- private readonly IProductService _productService;
- private readonly IGiftVoucherService _giftVoucherService;
- private readonly IDownloadService _downloadService;
- private readonly IStoreService _storeService;
- private readonly IVendorService _vendorService;
- private readonly IAddressAttributeParser _addressAttributeParser;
- private readonly IPictureService _pictureService;
- private readonly IMerchandiseReturnService _merchandiseReturnService;
- private readonly ICustomerService _customerService;
- private readonly IWarehouseService _warehouseService;
- private readonly CurrencySettings _currencySettings;
- private readonly TaxSettings _taxSettings;
- private readonly AddressSettings _addressSettings;
- private readonly IOrderTagService _orderTagService;
- private readonly IOrderStatusService _orderStatusService;
+ Picture picture = null;
- #endregion
+ if (attributes != null && attributes.Any())
+ {
+ var comb = product.FindProductAttributeCombination(attributes);
+ if (comb != null)
+ if (!string.IsNullOrEmpty(comb.PictureId))
+ {
+ var combPicture = await _pictureService.GetPictureById(comb.PictureId);
+ if (combPicture != null) picture = combPicture;
+ }
+
+ if (picture == null)
+ {
+ var attributeValues = product.ParseProductAttributeValues(attributes);
+ foreach (var attributeValue in attributeValues)
+ {
+ var attributePicture = await _pictureService.GetPictureById(attributeValue.PictureId);
+ if (attributePicture != null)
+ {
+ picture = attributePicture;
+ break;
+ }
+ }
+ }
+ }
+
+ if (picture == null)
+ {
+ var pp = product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault();
+ if (pp != null)
+ picture = await _pictureService.GetPictureById(pp.PictureId);
+ }
+
+ return picture;
+ }
+
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs
index ef2bd753b..bcb40aab0 100644
--- a/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs
+++ b/src/Web/Grand.Web.Vendor/Services/ProductViewModelService.cs
@@ -185,7 +185,8 @@ public class ProductViewModelService : IProductViewModelService
ProductId = product.Id,
PictureId = picture.PictureId,
PictureUrl = await _pictureService.GetPictureUrl(picture.PictureId),
- DisplayOrder = picture.DisplayOrder
+ DisplayOrder = picture.DisplayOrder,
+ IsDefault = picture.IsDefault
});
model.PrimaryStoreCurrencyCode =
@@ -209,7 +210,8 @@ public class ProductViewModelService : IProductViewModelService
ProductId = product.Id,
PictureId = x.PictureId,
PictureUrl = await _pictureService.GetPictureUrl(x.PictureId),
- DisplayOrder = x.DisplayOrder
+ DisplayOrder = x.DisplayOrder,
+ IsDefault = x.IsDefault
});
var associatedProduct = await _productService.GetProductById(model.AssociatedProductId);
@@ -1631,7 +1633,8 @@ public class ProductViewModelService : IProductViewModelService
ProductId = product.Id,
PictureId = x.PictureId,
PictureUrl = await _pictureService.GetPictureUrl(x.PictureId),
- DisplayOrder = x.DisplayOrder
+ DisplayOrder = x.DisplayOrder,
+ IsDefault = x.IsDefault
});
return model;
@@ -2171,6 +2174,7 @@ public class ProductViewModelService : IProductViewModelService
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
DisplayOrder = x.DisplayOrder,
+ IsDefault = x.IsDefault,
Style = picture?.Style,
ExtraField = picture?.ExtraField
};
@@ -2192,6 +2196,7 @@ public class ProductViewModelService : IProductViewModelService
AltAttribute = picture?.AltAttribute,
TitleAttribute = picture?.TitleAttribute,
DisplayOrder = productPicture.DisplayOrder,
+ IsDefault = productPicture.IsDefault,
Style = picture?.Style,
ExtraField = picture?.ExtraField
};
@@ -2209,7 +2214,8 @@ public class ProductViewModelService : IProductViewModelService
await _productService.InsertProductPicture(new ProductPicture {
PictureId = picture.Id,
- DisplayOrder = displayOrder
+ DisplayOrder = displayOrder,
+ IsDefault = product.ProductPictures.Any()
}, product.Id);
await _pictureService.SetSeoFilename(picture, _pictureService.GetPictureSeName(product.Name));
@@ -2228,6 +2234,7 @@ public class ProductViewModelService : IProductViewModelService
throw new ArgumentException("No picture found with the specified id");
productPicture.DisplayOrder = model.DisplayOrder;
+ productPicture.IsDefault = model.IsDefault;
await _productService.UpdateProductPicture(productPicture, product.Id);
//Update picture fields
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index ea24e0a36..c92c6ce0d 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -2988,6 +2988,9 @@
<Resource Name="Admin.Catalog.Products.Pictures.Fields.ExtraField" Area="Admin">
<Value>Extra field</Value>
</Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.IsDefault" Area="Admin">
+ <Value>The default photo</Value>
+ </Resource>
<Resource Name="Admin.Catalog.Products.Pictures.Fields.OverrideAltAttribute" Area="Admin">
<Value>Alt</Value>
</Resource>
diff --git a/src/Web/Grand.Web/Extensions/ProductExtensions.cs b/src/Web/Grand.Web/Extensions/ProductExtensions.cs
index d8e069cba..08de2251f 100644
--- a/src/Web/Grand.Web/Extensions/ProductExtensions.cs
+++ b/src/Web/Grand.Web/Extensions/ProductExtensions.cs
@@ -50,7 +50,9 @@ public static class ProductExtensions
if (picture == null)
{
- var pp = product.ProductPictures.MinBy(x => x.DisplayOrder);
+ var pp = product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault();
if (pp != null)
picture = await pictureService.GetPictureById(pp.PictureId);
}
diff --git a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
index 73b53b984..489b661e3 100644
--- a/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Catalog/GetSearchAutoCompleteHandler.cs
@@ -121,7 +121,9 @@ public class GetSearchAutoCompleteHandler : IRequestHandler<GetSearchAutoComplet
var pictureUrl = "";
if (_catalogSettings.ShowProductImagesInSearchAutoComplete)
{
- var picture = item.ProductPictures.MinBy(x => x.DisplayOrder);
+ var picture = item.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault();
if (picture != null)
pictureUrl = await _pictureService.GetPictureUrl(picture.PictureId,
_mediaSettings.AutoCompleteSearchThumbPictureSize);
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
index bdbf5b434..9416c71e8 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductDetailsPageHandler.cs
@@ -562,7 +562,9 @@ public class GetProductDetailsPageHandler : IRequestHandler<GetProductDetailsPag
private async Task<(PictureModel defaultPictureModel, List<PictureModel> pictureModels)>
PrepareProductPictureModel(Product product, int defaultPictureSize, bool isAssociatedProduct, string name)
{
- var defaultPicture = product.ProductPictures.MinBy(x => x.DisplayOrder) ?? new ProductPicture();
+ var defaultPicture = product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault() ?? new ProductPicture();
var picture = await _pictureService.GetPictureById(defaultPicture.PictureId);
@@ -1137,7 +1139,9 @@ public class GetProductDetailsPageHandler : IRequestHandler<GetProductDetailsPag
bundleProduct.PriceValue = productprice.productprice;
}
- var productPicture = p1.ProductPictures.MinBy(x => x.DisplayOrder) ?? new ProductPicture();
+ var productPicture = p1.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault() ?? new ProductPicture();
var picture = await _pictureService.GetPictureById(productPicture.PictureId);
diff --git a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
index 880a9cb84..2f35c2703 100644
--- a/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
+++ b/src/Web/Grand.Web/Features/Handlers/Products/GetProductOverviewHandler.cs
@@ -461,12 +461,15 @@ public class GetProductOverviewHandler : IRequestHandler<GetProductOverview, IEn
}
//prepare picture model
- result.Add(await PreparePictureModel(product.ProductPictures.MinBy(x => x.DisplayOrder)));
+ result.Add(await PreparePictureModel(product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder)
+ .FirstOrDefault()));
//prepare second picture model
if (!_catalogSettings.SecondPictureOnCatalogPages) return result;
- var secondPicture = product.ProductPictures.OrderBy(x => x.DisplayOrder).Skip(1).Take(1)
+ var secondPicture = product.ProductPictures.OrderByDescending(p => p.IsDefault)
+ .ThenBy(p => p.DisplayOrder).Skip(1).Take(1)
.FirstOrDefault();
if (secondPicture != null)
result.Add(await PreparePictureModel(secondPicture));