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

fixes

This commit is contained in:
Loretta 2024-11-27 16:25:14 +01:00
parent 354bdb6556
commit d9b4a7ffdd
6 changed files with 683 additions and 676 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs
View File

@ -1,10 +1,7 @@
using ExCSS; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Nop.Core; using Nop.Core;
using Nop.Core.Domain.Catalog; using Nop.Core.Domain.Catalog;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Dtos; using Nop.Plugin.Misc.AuctionPlugin.Domains.Dtos;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
using Nop.Plugin.Misc.AuctionPlugin.Models; using Nop.Plugin.Misc.AuctionPlugin.Models;
using Nop.Plugin.Misc.AuctionPlugin.Services; using Nop.Plugin.Misc.AuctionPlugin.Services;
using Nop.Services.Cms; using Nop.Services.Cms;
@ -15,7 +12,6 @@ using Nop.Web.Framework.Components;
using Nop.Web.Framework.Infrastructure; using Nop.Web.Framework.Infrastructure;
using Nop.Web.Models.Catalog; using Nop.Web.Models.Catalog;
using Nop.Web.Framework.Mvc.Routing; using Nop.Web.Framework.Mvc.Routing;
using DocumentFormat.OpenXml.EMMA;
using Nop.Services.Catalog; using Nop.Services.Catalog;
namespace Nop.Plugin.Misc.AuctionPlugin.Components; namespace Nop.Plugin.Misc.AuctionPlugin.Components;
@ -24,40 +20,41 @@ public class AuctionPublicViewComponent : NopViewComponent
{ {
#region Fields #region Fields
protected readonly IAddressService _addressService; //private readonly IAddressService _addressService;
protected readonly IGenericAttributeService _genericAttributeService; //private readonly IGenericAttributeService _genericAttributeService;
protected readonly IWidgetPluginManager _widgetPluginManager; private readonly IWidgetPluginManager _widgetPluginManager;
protected readonly IWorkContext _workContext; private readonly IWorkContext _workContext;
protected readonly AuctionService _auctionService; private readonly AuctionService _auctionService;
protected readonly AuctionSettings _auctionSettings; //private readonly AuctionSettings _auctionSettings;
protected readonly ICustomerService _customerService; private readonly ICustomerService _customerService;
protected readonly IWebHelper _webHelper; private readonly IWebHelper _webHelper;
protected readonly IProductService _productService; private readonly IProductService _productService;
protected readonly ILogger _logger; private readonly ILogger _logger;
protected readonly MyProductModelFactory _myProductModelFactory; private readonly MyProductModelFactory _myProductModelFactory;
#endregion #endregion
#region Ctor #region Ctor
public AuctionPublicViewComponent(IAddressService addressService, public AuctionPublicViewComponent(
IGenericAttributeService genericAttributeService, //IAddressService addressService,
//IGenericAttributeService genericAttributeService,
IWidgetPluginManager widgetPluginManager, IWidgetPluginManager widgetPluginManager,
IWorkContext workContext, IWorkContext workContext,
AuctionService auctionService, AuctionService auctionService,
AuctionSettings auctionSettings, //AuctionSettings auctionSettings,
ICustomerService customerService, ICustomerService customerService,
IWebHelper webHelper, IWebHelper webHelper,
IProductService productService, IProductService productService,
MyProductModelFactory myProductModelFactory, MyProductModelFactory myProductModelFactory,
ILogger logger) ILogger logger)
{ {
_addressService = addressService; //_addressService = addressService;
_genericAttributeService = genericAttributeService; //_genericAttributeService = genericAttributeService;
_widgetPluginManager = widgetPluginManager; _widgetPluginManager = widgetPluginManager;
_workContext = workContext; _workContext = workContext;
_auctionService = auctionService; _auctionService = auctionService;
_auctionSettings = auctionSettings; //_auctionSettings = auctionSettings;
_customerService = customerService; _customerService = customerService;
_webHelper = webHelper; _webHelper = webHelper;
_productService = productService; _productService = productService;
@ -96,7 +93,7 @@ public class AuctionPublicViewComponent : NopViewComponent
//if (!_auctionSettings.Enabled) //if (!_auctionSettings.Enabled)
// return Content(string.Empty); // return Content(string.Empty);
var productDetailsModel = additionalData as ProductDetailsModel; var productDetailsModel = (additionalData as ProductDetailsModel)!;
await _logger.InformationAsync($"WidgetViewComponent product: {productDetailsModel.Name}"); await _logger.InformationAsync($"WidgetViewComponent product: {productDetailsModel.Name}");
@ -132,7 +129,7 @@ public class AuctionPublicViewComponent : NopViewComponent
var productBidBoxViewModel = new ProductBidBoxViewModel(auctionDto); var productBidBoxViewModel = new ProductBidBoxViewModel(auctionDto);
//List<ProductToAuctionMapping> productToAuctionId = await _auctionService.GetProductToAuctionByAuctionIdAndProductIdAsync(auctionId, productDetailsModel.Id); //List<ProductToAuctionMapping> productToAuctionId = await _auctionService.GetProductToAuctionByAuctionIdAndProductIdAsync(auctionId, productDetailsModel.Id);
AuctionStatus status = productToAuction.AuctionStatus; var status = productToAuction.AuctionStatus;
//bool isActive = status == AuctionStatus.Active || status == AuctionStatus.FirstWarning || status == AuctionStatus.SecondWarning; //bool isActive = status == AuctionStatus.Active || status == AuctionStatus.FirstWarning || status == AuctionStatus.SecondWarning;
//bool isFirstWarning = status == AuctionStatus.FirstWarning; //bool isFirstWarning = status == AuctionStatus.FirstWarning;
@ -140,23 +137,25 @@ public class AuctionPublicViewComponent : NopViewComponent
ProductToAuctionDto nextProductToAuction; ProductToAuctionDto nextProductToAuction;
ProductToAuctionDto lastProductToAuction; ProductToAuctionDto lastProductToAuction;
string nextUrl = ""; var nextUrl = "";
string lastUrl = ""; var lastUrl = "";
string nextImageUrl = ""; var nextImageUrl = "";
string lastImageUrl = ""; var lastImageUrl = "";
string nextProductName = ""; var nextProductName = "";
string lastProductName = ""; var lastProductName = "";
if (productToAuction.SortIndex < detailedAuctionDto.ProductToAuctionDtos.Count) if (productToAuction.SortIndex < detailedAuctionDto.ProductToAuctionDtos.Count)
{ {
nextProductToAuction = detailedAuctionDto.ProductToAuctionDtos.Where(x => x.SortIndex == productToAuction.SortIndex + 1).FirstOrDefault(); nextProductToAuction = detailedAuctionDto.ProductToAuctionDtos.FirstOrDefault(x => x.SortIndex == productToAuction.SortIndex + 1);
if (nextProductToAuction != null)
{
var nextProductId = nextProductToAuction.ProductId; var nextProductId = nextProductToAuction.ProductId;
var nextProduct = await _productService.GetProductByIdAsync(nextProductId); var nextProduct = await _productService.GetProductByIdAsync(nextProductId);
var nextDetails = await _myProductModelFactory.PrepareProductDetailsModelAsync(nextProduct); var nextDetails = await _myProductModelFactory.PrepareProductDetailsModelAsync(nextProduct);
nextUrl = Url.RouteUrl<Product>(new { nextDetails.SeName }, _webHelper.GetCurrentRequestProtocol()).ToLowerInvariant(); nextUrl = Url.RouteUrl<Product>(new { nextDetails.SeName }, _webHelper.GetCurrentRequestProtocol()).ToLowerInvariant();
nextImageUrl = nextDetails.DefaultPictureModel.FullSizeImageUrl; nextImageUrl = nextDetails.DefaultPictureModel.FullSizeImageUrl;
nextProductName = nextDetails.SeName; nextProductName = nextDetails.SeName;
}
} }
else else
{ {
@ -165,7 +164,9 @@ public class AuctionPublicViewComponent : NopViewComponent
if (productToAuction.SortIndex > 1) if (productToAuction.SortIndex > 1)
{ {
lastProductToAuction = detailedAuctionDto.ProductToAuctionDtos.Where(x => x.SortIndex == productToAuction.SortIndex - 1).FirstOrDefault(); lastProductToAuction = detailedAuctionDto.ProductToAuctionDtos.FirstOrDefault(x => x.SortIndex == productToAuction.SortIndex - 1);
if (lastProductToAuction != null)
{
var lastProductId = lastProductToAuction.ProductId; var lastProductId = lastProductToAuction.ProductId;
var lastProduct = await _productService.GetProductByIdAsync(lastProductId); var lastProduct = await _productService.GetProductByIdAsync(lastProductId);
var lastDetails = await _myProductModelFactory.PrepareProductDetailsModelAsync(lastProduct); var lastDetails = await _myProductModelFactory.PrepareProductDetailsModelAsync(lastProduct);
@ -173,14 +174,12 @@ public class AuctionPublicViewComponent : NopViewComponent
lastImageUrl = lastDetails.DefaultPictureModel.FullSizeImageUrl; lastImageUrl = lastDetails.DefaultPictureModel.FullSizeImageUrl;
lastProductName = lastDetails.SeName; lastProductName = lastDetails.SeName;
} }
}
else else
{ {
lastProductToAuction = null; lastProductToAuction = null;
} }
productBidBoxViewModel.IsAdmin = await _customerService.IsAdminAsync(customer); productBidBoxViewModel.IsAdmin = await _customerService.IsAdminAsync(customer);
productBidBoxViewModel.IsGuest = await _customerService.IsGuestAsync(customer); productBidBoxViewModel.IsGuest = await _customerService.IsGuestAsync(customer);
productBidBoxViewModel.AuctionClosed = auctionDto.Closed; productBidBoxViewModel.AuctionClosed = auctionDto.Closed;
@ -200,7 +199,7 @@ public class AuctionPublicViewComponent : NopViewComponent
productBidBoxViewModel.LastProductName = lastProductName; productBidBoxViewModel.LastProductName = lastProductName;
productBidBoxViewModel.NextProductName = nextProductName; productBidBoxViewModel.NextProductName = nextProductName;
productBidBoxViewModel.LicitStep = AuctionService.GetStepAmount(productToAuction.CurrentPrice); //add calculation productBidBoxViewModel.LicitStep = AuctionService.GetStepAmount(productToAuction.CurrentPrice); //add calculation
productBidBoxViewModel.NextBidPrice = productToAuction.CurrentPrice + productBidBoxViewModel.LicitStep; productBidBoxViewModel.NextBidPrice = AuctionService.GetNextBidPrice(productToAuction.CurrentPrice, productBidBoxViewModel.LicitStep);
return View("~/Plugins/Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml", productBidBoxViewModel); return View("~/Plugins/Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml", productBidBoxViewModel);

7
Nop.Plugin.Misc.AuctionPlugin/Hubs/SignalRMessageHandler.cs
View File

@ -323,11 +323,8 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Hubs
} }
private static decimal GetStepAmount(decimal currentBidPrice) => AuctionService.GetStepAmount(currentBidPrice); private static decimal GetStepAmount(decimal currentBidPrice) => AuctionService.GetStepAmount(currentBidPrice);
private static decimal GetNextBidPrice(decimal currentBidPrice) => GetNextBidPrice(currentBidPrice, GetStepAmount(currentBidPrice)); private static decimal GetNextBidPrice(decimal currentBidPrice) => AuctionService.GetNextBidPrice(currentBidPrice, GetStepAmount(currentBidPrice));
private static decimal GetNextBidPrice(decimal currentBidPrice, decimal stepAmount) private static decimal GetNextBidPrice(decimal currentBidPrice, decimal stepAmount) => AuctionService.GetNextBidPrice(currentBidPrice, stepAmount);
{
return currentBidPrice + stepAmount;
}
private static bool IsValidRequestAuctionStatus(AuctionStatus newStatus, AuctionStatus oldStatus) private static bool IsValidRequestAuctionStatus(AuctionStatus newStatus, AuctionStatus oldStatus)
{ {

8
Nop.Plugin.Misc.AuctionPlugin/Models/AuctionPublicInfoModel.cs
View File

@ -1,7 +1,6 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Dtos; using Nop.Plugin.Misc.AuctionPlugin.Domains.Dtos;
using Nop.Web.Framework.Models; using Nop.Web.Framework.Models;
using Nop.Web.Framework.Mvc.ModelBinding;
namespace Nop.Plugin.Misc.AuctionPlugin.Models namespace Nop.Plugin.Misc.AuctionPlugin.Models
{ {
@ -29,11 +28,14 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Models
public AuctionPublicInfoModel(AuctionDto auctionDto) : this() public AuctionPublicInfoModel(AuctionDto auctionDto) : this()
{ {
AuctionDto = auctionDto; AuctionDto = auctionDto;
FirstProductToAuction = AuctionDto.ProductToAuctionDtos.First();
StartDate = AuctionDto.StartDateUtc;
FirstProductToAuction = AuctionDto.ProductToAuctionDtos.FirstOrDefault();
if (FirstProductToAuction == null) return;
ProductId = FirstProductToAuction.ProductId; ProductId = FirstProductToAuction.ProductId;
ProductToAuctionMappingId = FirstProductToAuction.Id; ProductToAuctionMappingId = FirstProductToAuction.Id;
StartDate = AuctionDto.StartDateUtc;
IsActive = FirstProductToAuction.IsActiveItem; IsActive = FirstProductToAuction.IsActiveItem;
} }
} }

8
Nop.Plugin.Misc.AuctionPlugin/Models/ProductBidBoxViewModel.cs
View File

@ -27,7 +27,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Models
public int AuctionId { get; set; } public int AuctionId { get; set; }
public bool AuctionClosed { get; set; } public bool AuctionClosed { get; set; }
public bool IsItemActive => FirstProductToAuction.IsActiveItem; public bool IsItemActive => FirstProductToAuction?.IsActiveItem ?? false;
public AuctionStatus AuctionStatus { get; set; } public AuctionStatus AuctionStatus { get; set; }
public int ProductId { get; set; } public int ProductId { get; set; }
@ -62,9 +62,11 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Models
public ProductBidBoxViewModel(AuctionDto auctionDto) : this() public ProductBidBoxViewModel(AuctionDto auctionDto) : this()
{ {
AuctionDto = auctionDto; AuctionDto = auctionDto;
FirstProductToAuction = AuctionDto.ProductToAuctionDtos.First();
AuctionId = auctionDto.Id; AuctionId = auctionDto.Id;
FirstProductToAuction = AuctionDto.ProductToAuctionDtos.FirstOrDefault();
if (FirstProductToAuction == null) return;
ProductId = FirstProductToAuction.ProductId; ProductId = FirstProductToAuction.ProductId;
ProductToAuctionId = FirstProductToAuction.Id; ProductToAuctionId = FirstProductToAuction.Id;
} }

6
Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs
View File

@ -95,6 +95,12 @@ public class AuctionService : IAuctionService
//200 000 000 Ft fölött 20 000 000 Ft-tal //200 000 000 Ft fölött 20 000 000 Ft-tal
} }
public static decimal GetNextBidPrice(decimal currentBidPrice) => GetNextBidPrice(currentBidPrice, GetStepAmount(currentBidPrice));
public static decimal GetNextBidPrice(decimal currentBidPrice, decimal stepAmount)
{
return currentBidPrice + stepAmount;
}
public async Task ResetProductToAuctionByProductId(int productId) public async Task ResetProductToAuctionByProductId(int productId)
=> await ResetProductToAuctionAsync(await _ctx.ProductToAuctions.GetByProductId(productId).FirstOrDefaultAsync()); => await ResetProductToAuctionAsync(await _ctx.ProductToAuctions.GetByProductId(productId).FirstOrDefaultAsync());

23
Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml
View File

@ -9,9 +9,12 @@
@{ @{
if (!Model.IsGuest) if (!Model.IsGuest)
{ {
var bgClass = Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault().WinnerCustomerId == Model.CustomerId ? "bg-success" : "bg-primary"; if (Model.FirstProductToAuction != null)
bool bidButtonActive = Model.IsItemActive && (Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault().WinnerCustomerId == Model.CustomerId && !Model.IsAdmin) ? true : false; {
string title = Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault().WinnerCustomerId == Model.CustomerId ? "Your bid is leading" : "Place a bid!"; var bgClass = Model.FirstProductToAuction.WinnerCustomerId == Model.CustomerId ? "bg-success" : "bg-primary";
var bidButtonActive = Model.IsItemActive && (Model.FirstProductToAuction.WinnerCustomerId != Model.CustomerId || Model.IsAdmin);
var title = Model.FirstProductToAuction.WinnerCustomerId == Model.CustomerId ? "Your bid is leading" : "Place a bid!";
<div class="d-flex justify-content-between" id="otherAuctionItems"> <div class="d-flex justify-content-between" id="otherAuctionItems">
<a href="@(string.IsNullOrEmpty(Model.LastProductUrl) ? "#" : Model.LastProductUrl)" @(string.IsNullOrEmpty(Model.LastProductUrl) ? "disabled" : string.Empty)> <a href="@(string.IsNullOrEmpty(Model.LastProductUrl) ? "#" : Model.LastProductUrl)" @(string.IsNullOrEmpty(Model.LastProductUrl) ? "disabled" : string.Empty)>
<div class="card mb-3" style="max-width: 540px;"> <div class="card mb-3" style="max-width: 540px;">
@ -23,12 +26,12 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title">@(string.IsNullOrEmpty(Model.LastProductUrl) ? "Start of list" : "Back to last")</h5> <h5 class="card-title">@(string.IsNullOrEmpty(Model.LastProductUrl) ? "Start of list" : "Back to last")</h5>
<p class="card-text">@(string.IsNullOrEmpty(Model.LastProductName) ? "---" : Model.LastProductName)</p> <p class="card-text">@(string.IsNullOrEmpty(Model.LastProductName) ? "---" : Model.LastProductName)</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</a> </a>
<a href="@(string.IsNullOrEmpty(Model.NextProductUrl) ? "#" : Model.NextProductUrl)" @(string.IsNullOrEmpty(Model.NextProductUrl) ? "disabled" : string.Empty)> <a href="@(string.IsNullOrEmpty(Model.NextProductUrl) ? "#" : Model.NextProductUrl)" @(string.IsNullOrEmpty(Model.NextProductUrl) ? "disabled" : string.Empty)>
<div class="card mb-3" style="max-width: 540px;"> <div class="card mb-3" style="max-width: 540px;">
<div class="row g-0"> <div class="row g-0">
@ -39,7 +42,6 @@
<div class="card-body"> <div class="card-body">
<h5 class="card-title">@(string.IsNullOrEmpty(Model.NextProductUrl) ? "End of list" : "Coming up next...")</h5> <h5 class="card-title">@(string.IsNullOrEmpty(Model.NextProductUrl) ? "End of list" : "Coming up next...")</h5>
<p class="card-text">@(string.IsNullOrEmpty(Model.NextProductName) ? "---" : Model.NextProductName)</p> <p class="card-text">@(string.IsNullOrEmpty(Model.NextProductName) ? "---" : Model.NextProductName)</p>
</div> </div>
</div> </div>
</div> </div>
@ -62,7 +64,7 @@
<span id="licitStepText" class="value">@($"{Model.LicitStep:c}")</span> <span id="licitStepText" class="value">@($"{Model.LicitStep:c}")</span>
</div> </div>
<div> <div>
<button id="signalRBidButton" class="btn btn-success" style="text-transform: uppercase;" type="button" disabled="@(bidButtonActive)"> <button id="signalRBidButton" class="btn btn-success" style="text-transform: uppercase;" type="button" @(!bidButtonActive ? "disabled" : string.Empty)>
Bid @($"{Model.NextBidPrice:c}") Bid @($"{Model.NextBidPrice:c}")
</button> </button>
@* <button id="bidButton" class="btn btn-success"> @* <button id="bidButton" class="btn btn-success">
@ -122,8 +124,7 @@
{ {
<p>No access to admin level buttons</p> <p>No access to admin level buttons</p>
} }
}
} }
else else
{ {
@ -135,9 +136,9 @@
</div> </div>
</div> </div>
} }
} }
<script> <script>
var bidBoxPageViewModel; var bidBoxPageViewModel;
$(window).load(function () { $(window).load(function () {
@ -521,4 +522,4 @@
} }
</script> </script>