Adam
/
Nop.Core_4.7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge, plus nop core add, plus productbox changes

This commit is contained in:
Adam 2024-11-29 13:46:16 +01:00
parent 569947d7f5
commit 3cf0562759
5 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Presentation/Nop.Web/Factories/CatalogModelFactory.cs
View File

@ -363,7 +363,7 @@ public partial class CatalogModelFactory : ICatalogModelFactory
model.NoResultMessage = await _localizationService.GetResourceAsync("Catalog.Products.NoResult"); model.NoResultMessage = await _localizationService.GetResourceAsync("Catalog.Products.NoResult");
else else
{ {
model.Products = (await _productModelFactory.PrepareProductOverviewModelsAsync(products)).ToList(); model.Products = (await _productModelFactory.PrepareProductDetailsModelsAsync(products)).ToList();
model.LoadPagedList(products); model.LoadPagedList(products);
} }
} }

3
Presentation/Nop.Web/Factories/IProductModelFactory.cs
View File

@ -37,6 +37,9 @@ public partial interface IProductModelFactory
int? productThumbPictureSize = null, bool prepareSpecificationAttributes = false, int? productThumbPictureSize = null, bool prepareSpecificationAttributes = false,
bool forceRedirectionAfterAddingToCart = false); bool forceRedirectionAfterAddingToCart = false);
//TODO - A.
Task<IEnumerable<ProductDetailsModel>> PrepareProductDetailsModelsAsync(IEnumerable<Product> products);
/// <summary> /// <summary>
/// Prepare the product combination models /// Prepare the product combination models
/// </summary> /// </summary>

16
Presentation/Nop.Web/Factories/ProductModelFactory.cs
View File

@ -1411,6 +1411,22 @@ public partial class ProductModelFactory : IProductModelFactory
return models; return models;
} }
//TODO - A.
public virtual async Task<IEnumerable<ProductDetailsModel>> PrepareProductDetailsModelsAsync(IEnumerable<Product> products)
{
ArgumentNullException.ThrowIfNull(products);
var models = new List<ProductDetailsModel>();
foreach (var product in products)
{
var model = await PrepareProductDetailsModelAsync(product);
models.Add(model);
}
return models;
}
/// <summary> /// <summary>
/// Prepare the product combination models /// Prepare the product combination models
/// </summary> /// </summary>

4
Presentation/Nop.Web/Models/Catalog/CatalogProductsModel.cs
View File

@ -83,7 +83,7 @@ public partial record CatalogProductsModel : BasePageableModel
/// <summary> /// <summary>
/// Gets or sets the products /// Gets or sets the products
/// </summary> /// </summary>
public IList<ProductOverviewModel> Products { get; set; } public IList<ProductDetailsModel> Products { get; set; }
#endregion #endregion
@ -97,7 +97,7 @@ public partial record CatalogProductsModel : BasePageableModel
AvailableSortOptions = new List<SelectListItem>(); AvailableSortOptions = new List<SelectListItem>();
AvailableViewModes = new List<SelectListItem>(); AvailableViewModes = new List<SelectListItem>();
PageSizeOptions = new List<SelectListItem>(); PageSizeOptions = new List<SelectListItem>();
Products = new List<ProductOverviewModel>(); Products = new List<ProductDetailsModel>();
} }
#endregion #endregion

41
Presentation/Nop.Web/Themes/Cypher_Bootstrap5/Views/Shared/_ProductBox.cshtml
View File

@ -1,4 +1,4 @@
@model ProductOverviewModel @model ProductDetailsModel
@using Nop.Core @using Nop.Core
@using Nop.Core.Domain.Catalog @using Nop.Core.Domain.Catalog
@using Nop.Core.Domain.Orders @using Nop.Core.Domain.Orders
@ -10,14 +10,14 @@
var addtocartlink = ""; var addtocartlink = "";
var shoppingCartTypeId = (int)ShoppingCartType.ShoppingCart; var shoppingCartTypeId = (int)ShoppingCartType.ShoppingCart;
var quantity = 1; var quantity = 1;
if (Model.ProductPrice.ForceRedirectionAfterAddingToCart) // if (Model.ProductPrice.ForceRedirectionAfterAddingToCart)
{ // {
addtocartlink = Url.RouteUrl("AddProductToCart-Catalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, quantity = quantity, forceredirection = Model.ProductPrice.ForceRedirectionAfterAddingToCart }); // addtocartlink = Url.RouteUrl("AddProductToCart-Catalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, quantity = quantity, forceredirection = Model.ProductPrice.ForceRedirectionAfterAddingToCart });
} // }
else // else
{ // {
addtocartlink = Url.RouteUrl("AddProductToCart-Catalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, quantity = quantity }); addtocartlink = Url.RouteUrl("AddProductToCart-Catalog", new { productId = Model.Id, shoppingCartTypeId = shoppingCartTypeId, quantity = quantity });
} // }
var addtowishlistlink = Url.RouteUrl("AddProductToCart-Catalog", new { productId = Model.Id, shoppingCartTypeId = (int)ShoppingCartType.Wishlist, quantity = quantity }); var addtowishlistlink = Url.RouteUrl("AddProductToCart-Catalog", new { productId = Model.Id, shoppingCartTypeId = (int)ShoppingCartType.Wishlist, quantity = quantity });
var addtocomparelink = Url.RouteUrl("AddProductToCompare", new { productId = Model.Id }); var addtocomparelink = Url.RouteUrl("AddProductToCompare", new { productId = Model.Id });
@ -60,20 +60,29 @@
<h2 class="product-title"> <h2 class="product-title">
<a href="@(Url.RouteUrl<Product>(new {SeName = Model.SeName }))">@Model.Name</a> <a href="@(Url.RouteUrl<Product>(new {SeName = Model.SeName }))">@Model.Name</a>
</h2> </h2>
@if(Model.ProductManufacturers.Count > 0)
{
string manufacturers = "";
foreach(var manu in Model.ProductManufacturers)
{
manufacturers = manufacturers + manu.Name + ";";
}
<p>@manufacturers</p>
}
@if (catalogSettings.ShowSkuOnCatalogPages && !string.IsNullOrEmpty(Model.Sku)) @if (catalogSettings.ShowSkuOnCatalogPages && !string.IsNullOrEmpty(Model.Sku))
{ {
<div class="sku"> <div class="sku">
@Model.Sku @Model.Sku
</div> </div>
} }
@if (Model.ReviewOverviewModel.AllowCustomerReviews) @if (Model.ProductReviewOverview.AllowCustomerReviews)
{ {
var ratingPercent = 0; var ratingPercent = 0;
if (Model.ReviewOverviewModel.TotalReviews != 0) if (Model.ProductReviewOverview.TotalReviews != 0)
{ {
ratingPercent = ((Model.ReviewOverviewModel.RatingSum*100)/Model.ReviewOverviewModel.TotalReviews)/5; ratingPercent = ((Model.ProductReviewOverview.RatingSum * 100) / Model.ProductReviewOverview.TotalReviews) / 5;
} }
<div class="product-rating-box" title="@string.Format(T("Reviews.TotalReviews").Text, Model.ReviewOverviewModel.TotalReviews)"> <div class="product-rating-box" title="@string.Format(T("Reviews.TotalReviews").Text, Model.ProductReviewOverview.TotalReviews)">
<div class="rating"> <div class="rating">
<div style="width: @(ratingPercent)%"> <div style="width: @(ratingPercent)%">
</div> </div>
@ -110,25 +119,25 @@
@await Component.InvokeAsync(typeof(WidgetViewComponent), new { widgetZone = PublicWidgetZones.ProductBoxAddinfoMiddle, additionalData = Model }) @await Component.InvokeAsync(typeof(WidgetViewComponent), new { widgetZone = PublicWidgetZones.ProductBoxAddinfoMiddle, additionalData = Model })
<div class="buttons"> <div class="buttons">
@*<button type="button" class="button-1 product-box-detail-button" onclick="setLocation('@Url.RouteUrl("Product", new { SeName = Model.SeName })')">@T("Products.Details")</button>*@ @*<button type="button" class="button-1 product-box-detail-button" onclick="setLocation('@Url.RouteUrl("Product", new { SeName = Model.SeName })')">@T("Products.Details")</button>*@
@if (!Model.ProductPrice.DisableBuyButton) @if (!Model.AddToCart.DisableBuyButton)
{ {
var addToCartText = T("ShoppingCart.AddToCart").Text; var addToCartText = T("ShoppingCart.AddToCart").Text;
if (Model.ProductPrice.IsRental) if (Model.ProductPrice.IsRental)
{ {
addToCartText = T("ShoppingCart.Rent").Text; addToCartText = T("ShoppingCart.Rent").Text;
} }
if (Model.ProductPrice.AvailableForPreOrder) if (Model.AddToCart.AvailableForPreOrder)
{ {
addToCartText = T("ShoppingCart.PreOrder").Text; addToCartText = T("ShoppingCart.PreOrder").Text;
} }
<button type="button" class="btn btn-primary product-box-add-to-cart-button" onclick="AjaxCart.addproducttocart_catalog('@addtocartlink');return false;">@(addToCartText)</button> <button type="button" class="btn btn-primary product-box-add-to-cart-button" onclick="AjaxCart.addproducttocart_catalog('@addtocartlink');return false;">@(addToCartText)</button>
} }
@if (!Model.ProductPrice.DisableAddToCompareListButton) @if (Model.CompareProductsEnabled)
{ {
<button type="button" title="@T("ShoppingCart.AddToCompareList")" class="button-2 add-to-compare-list-button" onclick="AjaxCart.addproducttocomparelist('@addtocomparelink');return false;">@T("ShoppingCart.AddToCompareList")</button> <button type="button" title="@T("ShoppingCart.AddToCompareList")" class="button-2 add-to-compare-list-button" onclick="AjaxCart.addproducttocomparelist('@addtocomparelink');return false;">@T("ShoppingCart.AddToCompareList")</button>
} }
@if (!Model.ProductPrice.DisableWishlistButton) @if (!Model.AddToCart.DisableWishlistButton)
{ {
<button type="button" title="@T("ShoppingCart.AddToWishlist")" class="button-2 add-to-wishlist-button" onclick="AjaxCart.addproducttocart_catalog('@addtowishlistlink');return false;">@T("ShoppingCart.AddToWishlist")</button> <button type="button" title="@T("ShoppingCart.AddToWishlist")" class="button-2 add-to-wishlist-button" onclick="AjaxCart.addproducttocart_catalog('@addtowishlistlink');return false;">@T("ShoppingCart.AddToWishlist")</button>
} }