diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/Interfaces/IProductToAuctionDtoBase.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/Interfaces/IProductToAuctionDtoBase.cs index 0e82738..2bc8b17 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/Interfaces/IProductToAuctionDtoBase.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/Interfaces/IProductToAuctionDtoBase.cs @@ -9,6 +9,7 @@ public interface IProductToAuctionDtoBase : IMgModelDtoBase public int AuctionId { get; set; } public int WinnerCustomerId { get; set; } + public AuctionStatus AuctionStatus { get; set; } public decimal StartingPrice { get; set; } @@ -17,5 +18,4 @@ public interface IProductToAuctionDtoBase : IMgModelDtoBase public int ProductAmount { get; set; } public int SortIndex { get; set; } - public string BiddingNumber { get; set; } } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/ProductToAuctionDto.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/ProductToAuctionDto.cs index b7f06ca..0f97f9d 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/ProductToAuctionDto.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/ProductToAuctionDto.cs @@ -12,7 +12,7 @@ public class ProductToAuctionDto : IProductToAuctionDto public int ProductId { get; set; } public int AuctionId { get; set; } public int WinnerCustomerId { get; set; } - public string BiddingNumber { get; set; } + public AuctionStatus AuctionStatus { get; set; } public decimal StartingPrice { get; set; } public decimal CurrentPrice { get; set; } @@ -60,7 +60,6 @@ public class ProductToAuctionDto : IProductToAuctionDto ProductAmount = productToAuction.ProductAmount; SortIndex = productToAuction.SortIndex; WinnerCustomerId = productToAuction.WinnerCustomerId; - BiddingNumber = productToAuction.BiddingNumber; } public ProductToAuctionMapping CreateMainEntity() @@ -76,7 +75,6 @@ public class ProductToAuctionDto : IProductToAuctionDto mainEntity.ProductAmount = ProductAmount; mainEntity.SortIndex = SortIndex; mainEntity.WinnerCustomerId = WinnerCustomerId; - mainEntity.BiddingNumber = BiddingNumber; return mainEntity; } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Interfaces/IProductToAuctionMapping.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Interfaces/IProductToAuctionMapping.cs index 5999838..e070c2d 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Interfaces/IProductToAuctionMapping.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/Interfaces/IProductToAuctionMapping.cs @@ -5,6 +5,8 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Domains.Entities.Interfaces; public interface IProductToAuctionMapping : IProductToAuctionDtoBase, ITimeStampInfo //, ISoftRemoveEntityInt { + public int? BiddingNumber { get; set; } + public int OrderId { get; set; } public Guid? OrderGuid { get; set; } } \ No newline at end of file diff --git a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs index 22e7858..adcd658 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs @@ -17,7 +17,7 @@ public partial class ProductToAuctionMapping : MgEntityBase, IProductToAuctionMa public int OrderId { get; set; } public Guid? OrderGuid { get; set; } public int WinnerCustomerId { get; set; } - public string BiddingNumber { get; set; } + public int? BiddingNumber { get; set; } [NotMapped] [NotColumn] diff --git a/Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs b/Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs index 66fdd3d..32fc9de 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Services/AuctionService.cs @@ -15,6 +15,7 @@ using Nop.Core.Domain.Common; using Nop.Services.Common; using Nop.Services.Customers; using Nop.Services.Shipping; +using NUglify.Helpers; namespace Nop.Plugin.Misc.AuctionPlugin.Services; @@ -256,6 +257,7 @@ public class AuctionService( OrderTotal = productToAuction.CurrentPrice, }; processPaymentRequest.CustomValues.Add("TÉTEL: ", $"#{productToAuction.SortIndex}"); + if (productToAuction.BiddingNumber != null) processPaymentRequest.CustomValues.Add("BIDNUM", $"#{productToAuction.BiddingNumber}"); processPaymentRequest.CustomValues.Add("PTAID", $"#{productToAuction.Id}"); var product = await productService.GetProductByIdAsync(productToAuction.ProductId);