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

improvements, fixes, etc...

This commit is contained in:
Loretta 2024-11-18 15:32:37 +01:00
parent 5970cfb0a0
commit 1c1bb07fa6
12 changed files with 82 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,10 @@ using Microsoft.AspNetCore.Mvc.Routing;
using Nop.Core;
using Nop.Core.Domain.Catalog;
using Nop.Data;
using Nop.Plugin.AuctionPlugin.Components;
using Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Components;
using Nop.Plugin.Misc.AuctionPlugin.Components;
//using Nop.Plugin.Misc.AuctionPlugin.Components;
using Nop.Plugin.Widgets.AuctionPlugin.Components;
using Nop.Services.Catalog;
using Nop.Services.Cms;
using Nop.Services.Common;
@ -102,7 +101,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin
{
ArgumentNullException.ThrowIfNull(widgetZone);
if (widgetZone.Equals(PublicWidgetZones.ProductDetailsAfterPictures))
if (widgetZone.Equals(PublicWidgetZones.ProductDetailsOverviewTop))
{
return typeof(AuctionPublicViewComponent);
}
@ -129,7 +128,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin
{
return Task.FromResult<IList<string>>(new List<string>
{
PublicWidgetZones.ProductDetailsAfterPictures,
PublicWidgetZones.ProductDetailsOverviewTop,
PublicWidgetZones.ProductDetailsBottom,
PublicWidgetZones.HeaderAfter,
AdminWidgetZones.ProductDetailsButtons

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

@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Nop.Core;
using Nop.Plugin.Misc.AuctionPlugin;
using Nop.Plugin.Misc.AuctionPlugin.Models;
using Nop.Services.Cms;
using Nop.Services.Common;
@ -8,10 +7,8 @@ using Nop.Services.Logging;
using Nop.Web.Framework.Components;
using Nop.Web.Framework.Infrastructure;
using Nop.Web.Models.Catalog;
using Nop.Web.Models.Order;
using Nop.Web.Models.ShoppingCart;
namespace Nop.Plugin.AuctionPlugin.Components;
namespace Nop.Plugin.Misc.AuctionPlugin.Components;
public class AuctionPublicViewComponent : NopViewComponent
{
@ -85,7 +82,7 @@ public class AuctionPublicViewComponent : NopViewComponent
// return Content(string.Empty);
//}
if (!widgetZone.Equals(PublicWidgetZones.ProductDetailsAfterPictures))
if (!widgetZone.Equals(PublicWidgetZones.ProductDetailsOverviewTop))
{
await _logger.InformationAsync($"WidgetViewComponent is NOT in ProductDetailsTop now {widgetZone}");
return Content(string.Empty);

3
Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs
View File

@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Nop.Core;
using Nop.Plugin.Misc.AuctionPlugin;
using Nop.Plugin.Misc.AuctionPlugin.Models;
using Nop.Services.Cms;
using Nop.Services.Logging;
@ -8,7 +7,7 @@ using Nop.Web.Framework.Components;
using Nop.Web.Framework.Infrastructure;
using Nop.Web.Models.Catalog;
namespace Nop.Plugin.Widgets.AuctionPlugin.Components;
namespace Nop.Plugin.Misc.AuctionPlugin.Components;
public class AuctionViewComponent : NopViewComponent
{

4
Nop.Plugin.Misc.AuctionPlugin/Components/LiveAnnouncementViewComponent.cs
View File

@ -1,13 +1,11 @@
using Microsoft.AspNetCore.Mvc;
using Nop.Core;
using Nop.Plugin.Misc.AuctionPlugin;
using Nop.Services.Cms;
using Nop.Services.Logging;
using Nop.Web.Framework.Components;
using Nop.Web.Framework.Infrastructure;
namespace Nop.Plugin.AuctionPlugin.Components
namespace Nop.Plugin.Misc.AuctionPlugin.Components
{
[ViewComponent(Name = "LiveAnnouncement")]

1
Nop.Plugin.Misc.AuctionPlugin/Domains/DataLayer/AuctionDbTable.cs
View File

@ -18,5 +18,4 @@ public class AuctionDbTable: MgDbTableBase<Auction>
{
return GetAllAsync(auctions => auctions.OrderByDescending(x => x.StartDateUtc), _ => default);
}
}

8
Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/Interfaces/IProductToAuctionDtoBase.cs
View File

@ -10,8 +10,10 @@ public interface IProductToAuctionDtoBase : IMgModelDtoBase
public AuctionStatus AuctionStatus { get; set; }
public int StartingPrice { get; set; }
public int BidPrice { get; set; }
public decimal StartingPrice { get; set; }
public decimal BidPrice { get; set; }
public int BidAmount { get; set; }
public int ProductAmount { get; set; }
public int SortIndex { get; set; }
}

11
Nop.Plugin.Misc.AuctionPlugin/Domains/Dtos/ProductToAuctionDto.cs
View File

@ -10,9 +10,10 @@ public class ProductToAuctionDto : IProductToAuctionDto
public int ProductId { get; set; }
public int AuctionId { get; set; }
public AuctionStatus AuctionStatus { get; set; }
public int StartingPrice { get; set; }
public int BidPrice { get; set; }
public int BidAmount { get; set; }
public decimal StartingPrice { get; set; }
public decimal BidPrice { get; set; }
public int ProductAmount { get; set; }
public int SortIndex { get; set; }
public List<AuctionBidDto> AuctionBidDtos { get; } = [];
@ -29,7 +30,7 @@ public class ProductToAuctionDto : IProductToAuctionDto
AuctionStatus = productToAuction.AuctionStatus;
StartingPrice = productToAuction.StartingPrice;
BidPrice = productToAuction.BidPrice;
BidAmount = productToAuction.BidAmount;
ProductAmount = productToAuction.ProductAmount;
}
public ProductToAuctionMapping CreateMainEntity()
@ -42,7 +43,7 @@ public class ProductToAuctionDto : IProductToAuctionDto
mainEntity.AuctionStatus = AuctionStatus;
mainEntity.StartingPrice = StartingPrice;
mainEntity.BidPrice = BidPrice;
mainEntity.BidAmount = BidAmount;
mainEntity.ProductAmount = ProductAmount;
return mainEntity;
}

7
Nop.Plugin.Misc.AuctionPlugin/Domains/Entities/ProductToAuctionMapping.cs
View File

@ -17,10 +17,11 @@ public partial class ProductToAuctionMapping : MgEntityBase, IProductToAuctionMa
[NotColumn]
public AuctionStatus AuctionStatus { get; set; }
public int StartingPrice { get; set; }
public int BidPrice { get; set; }
public decimal StartingPrice { get; set; }
public decimal BidPrice { get; set; }
public int BidAmount { get; set; } = 1;
public int ProductAmount { get; set; } = 1;
public int SortIndex { get; set; }
[SkipValuesOnUpdate]
public DateTime Created { get; set; }

38
Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/AuctionBuilder.cs Normal file
View File

@ -0,0 +1,38 @@
using FluentMigrator;
using FluentMigrator.Builders.Create.Table;
using Nop.Data.Mapping.Builders;
using Nop.Plugin.Misc.AuctionPlugin.Domains.Entities;
using Nop.Data.Extensions;
using System.Data;
using Nop.Core.Domain.Catalog;
using Nop.Core.Domain.Common;
using Nop.Data.Mapping;
namespace Nop.Plugin.Misc.AuctionPlugin.Mapping.Builders;
public class AuctionBuilder : NopEntityBuilder<Auction>
{
#region Methods
/// <summary>
/// Apply entity configuration
/// </summary>
/// <param name="table">Create table expression builder</param>
public override void MapEntity(CreateTableExpressionBuilder table)
{
table.WithColumn(nameof(Auction.Id)).AsInt32().PrimaryKey().Identity()
//.WithColumn(nameof(Auction.AuctionId)).AsInt32().ForeignKey<Auction>(onDelete: Rule.Cascade) //Rule.Cascade??
//.WithColumn(nameof(Auction.ProductId)).AsInt32().ForeignKey<Product>(onDelete: Rule.Cascade) //Rule.Cascade??
.WithColumn(nameof(Auction.AuctionType)).AsByte().NotNullable() //enum??? - J.
//.WithColumn(nameof(Auction.StartingPrice)).AsInt32().NotNullable()
//.WithColumn(nameof(Auction.BidPrice)).AsInt32().NotNullable()
//.WithColumn(nameof(Auction.BidAmount)).AsInt32().NotNullable().WithDefaultValue(1)
.WithColumn(nameof(Auction.Created)).AsDateTime().NotNullable()
.WithColumn(nameof(Auction.Modified)).AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime);
}
#endregion
}

10
Nop.Plugin.Misc.AuctionPlugin/Mapping/Builders/ProductToAuctionBuilder.cs
View File

@ -22,14 +22,16 @@ public class ProductToAuctionMappingBuilder : NopEntityBuilder<ProductToAuctionM
{
table.WithColumn(nameof(ProductToAuctionMapping.Id)).AsInt32().PrimaryKey().Identity()
.WithColumn(nameof(ProductToAuctionMapping.AuctionId)).AsInt32().ForeignKey<Auction>(onDelete: Rule.None) //Rule.Cascade??
.WithColumn(nameof(ProductToAuctionMapping.ProductId)).AsInt32().ForeignKey<Product>(onDelete: Rule.None) //Rule.Cascade??
.WithColumn(nameof(ProductToAuctionMapping.AuctionId)).AsInt32().ForeignKey<Auction>(onDelete: Rule.Cascade) //Rule.Cascade??
.WithColumn(nameof(ProductToAuctionMapping.ProductId)).AsInt32().ForeignKey<Product>(onDelete: Rule.Cascade) //Rule.Cascade??
//.WithColumn(nameof(ProductToAuctionMapping.AuctionStatus)).AsByte().NotNullable() //enum??? - J.
.WithColumn(nameof(ProductToAuctionMapping.AuctionStatus)).AsByte().NotNullable() //enum??? - J.
.WithColumn(nameof(ProductToAuctionMapping.StartingPrice)).AsInt32().NotNullable()
.WithColumn(nameof(ProductToAuctionMapping.BidPrice)).AsInt32().NotNullable()
.WithColumn(nameof(ProductToAuctionMapping.BidAmount)).AsInt32().NotNullable().WithDefaultValue(1)
.WithColumn(nameof(ProductToAuctionMapping.ProductAmount)).AsInt32().NotNullable().WithDefaultValue(1)
.WithColumn(nameof(ProductToAuctionMapping.SortIndex)).AsInt32().NotNullable().WithDefaultValue(0)
.WithColumn(nameof(ProductToAuctionMapping.Created)).AsDateTime().NotNullable()
.WithColumn(nameof(ProductToAuctionMapping.Modified)).AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentUTCDateTime);
}

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

@ -1,4 +1,5 @@
using Nop.Core;
using AyCode.Core.Extensions;
using Nop.Core;
using Nop.Core.Caching;
using Nop.Core.Domain.Customers;
using Nop.Data;
@ -33,7 +34,7 @@ public class AuctionService : IAuctionService
protected readonly AuctionDbContext _ctx;
//protected readonly IRepository<AuctionBid> _customerBidRepository;
//protected readonly IRepository<Auction> _auctionRepository;
protected readonly IRepository<ProductToAuctionMapping> _productToAuctionRepository;
//protected readonly IRepository<ProductToAuctionMapping> _productToAuctionRepository;
protected readonly IShortTermCacheManager _shortTermCacheManager;
protected readonly IStaticCacheManager _staticCacheManager;
protected readonly IWorkContext _workContext;
@ -50,8 +51,8 @@ public class AuctionService : IAuctionService
/// <param name="staticCacheManager">Cache manager</param>
public AuctionService(
AuctionDbContext ctx,
IRepository<Auction> auctionRepository,
IRepository<ProductToAuctionMapping> productToAuctionRepository,
//IRepository<Auction> auctionRepository,
//IRepository<ProductToAuctionMapping> productToAuctionRepository,
IShortTermCacheManager shortTermCacheManager,
IStaticCacheManager staticCacheManager,
IWorkContext workContext,
@ -60,7 +61,7 @@ public class AuctionService : IAuctionService
_ctx = ctx;
//_customerBidRepository = customerBidRepository;
//_auctionRepository = auctionRepository;
_productToAuctionRepository = productToAuctionRepository;
//_productToAuctionRepository = productToAuctionRepository;
_shortTermCacheManager = shortTermCacheManager;
_staticCacheManager = staticCacheManager;
_workContext = workContext;
@ -158,7 +159,7 @@ public class AuctionService : IAuctionService
#endregion
#endregion
#region Dtos
#region Dtots
public async Task<AuctionDto> GetAuctionDtoByIdAsync(int auctionId)
{
return new AuctionDto(await _ctx.Auctions.GetByIdAsync(auctionId));
@ -181,6 +182,7 @@ public class AuctionService : IAuctionService
{
return new AuctionBidDto(await _ctx.AuctionBids.GetByIdAsync(auctionBidId));
}
public async Task<bool> AssignProductToAuctionAsync(int productId, decimal startingPrice, decimal bidPrice, int auctionId)
{
var auction = await _ctx.Auctions.GetByIdAsync(auctionId);
@ -190,9 +192,9 @@ public class AuctionService : IAuctionService
var mapping = new ProductToAuctionMapping
{
ProductId = productId,
StartingPrice = Convert.ToInt32(startingPrice),
BidPrice = Convert.ToInt32(bidPrice),
BidAmount = 0,
StartingPrice = startingPrice,
BidPrice = bidPrice,
ProductAmount = 0,
AuctionStatus = Domains.Enums.AuctionStatus.Active,
AuctionId = auctionId
};
@ -200,9 +202,11 @@ public class AuctionService : IAuctionService
{
await _ctx.ProductToAuctions.InsertAsync(mapping);
}
catch (Exception ex) {
catch (Exception ex)
{
await _logger.InformationAsync(ex.ToString());
}
}
return true;
}

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

@ -32,7 +32,7 @@
</div>
<button id="testButton" class="btn btn-success" style="display: none">
<button id="testButton" class="btn btn-success">
TestButton
</button>