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

Bootstrap reload theme, public bidbox logics, html and csss improvements

This commit is contained in:
Adam 2024-11-20 10:40:03 +01:00
parent 59ae22f5cd
commit f938fc8eb2
3 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,12 @@
using Nop.Core; using Nop.Core;
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.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;
using Nop.Services.Common; using Nop.Services.Common;
using Nop.Services.Customers;
using Nop.Services.Logging; using Nop.Services.Logging;
using Nop.Web.Framework.Components; using Nop.Web.Framework.Components;
using Nop.Web.Framework.Infrastructure; using Nop.Web.Framework.Infrastructure;
@ -23,6 +25,7 @@ public class AuctionPublicViewComponent : NopViewComponent
protected readonly IWorkContext _workContext; protected readonly IWorkContext _workContext;
protected readonly AuctionService _auctionService; protected readonly AuctionService _auctionService;
protected readonly AuctionSettings _auctionSettings; protected readonly AuctionSettings _auctionSettings;
protected readonly ICustomerService _customerService;
protected readonly ILogger _logger; protected readonly ILogger _logger;
#endregion #endregion
@ -35,6 +38,7 @@ public class AuctionPublicViewComponent : NopViewComponent
IWorkContext workContext, IWorkContext workContext,
AuctionService auctionService, AuctionService auctionService,
AuctionSettings auctionSettings, AuctionSettings auctionSettings,
ICustomerService customerService,
ILogger logger) ILogger logger)
{ {
_addressService = addressService; _addressService = addressService;
@ -43,6 +47,7 @@ public class AuctionPublicViewComponent : NopViewComponent
_workContext = workContext; _workContext = workContext;
_auctionService = auctionService; _auctionService = auctionService;
_auctionSettings = auctionSettings; _auctionSettings = auctionSettings;
_customerService = customerService;
_logger = logger; _logger = logger;
} }
@ -100,6 +105,7 @@ public class AuctionPublicViewComponent : NopViewComponent
List<ProductToAuctionMapping> auctionIds = await _auctionService.GetProductToAuctionsByProductIdAsync(productDetailsModel.Id); List<ProductToAuctionMapping> auctionIds = await _auctionService.GetProductToAuctionsByProductIdAsync(productDetailsModel.Id);
int auctionId = 0; int auctionId = 0;
AuctionDto auction;
if(auctionIds == null || auctionIds.Count == 0) if(auctionIds == null || auctionIds.Count == 0)
{ {
return Content(string.Empty); return Content(string.Empty);
@ -112,27 +118,32 @@ public class AuctionPublicViewComponent : NopViewComponent
//we have more auctions so we return the closest open //we have more auctions so we return the closest open
foreach (var auctionMapping in auctionIds) foreach (var auctionMapping in auctionIds)
{ {
var auction = await _auctionService.GetAuctionDtoByIdAsync(auctionMapping.AuctionId); var auctionItem = await _auctionService.GetAuctionDtoByIdAsync(auctionMapping.AuctionId);
if (!auction.Closed) if (!auctionItem.Closed)
{ {
openAuctionList.Add(auction); openAuctionList.Add(auctionItem);
} }
} }
//first auction that started or strats not earlier than yesterday //first auction that started or strats not earlier than yesterday
auctionId = openAuctionList.Where(x => x.StartDateUtc > DateTime.UtcNow.AddDays(-1)).OrderBy(x => x.StartDateUtc).FirstOrDefault().Id; auction = openAuctionList.Where(x => x.StartDateUtc > DateTime.UtcNow.AddDays(-1)).OrderBy(x => x.StartDateUtc).FirstOrDefault();
auctionId = auction.Id;
} }
else else
{ {
var valami = await _auctionService.GetAuctionDtoByIdAsync(auctionIds.FirstOrDefault().AuctionId); auction = await _auctionService.GetAuctionDtoByIdAsync(auctionIds.FirstOrDefault().AuctionId);
auctionId = valami.Id; auctionId = auction.Id;
} }
var productToAuctionId = await _auctionService.GetProductToAuctionByAuctionIdAndProductIdAsync(auctionId, productDetailsModel.Id); var productToAuctionId = await _auctionService.GetProductToAuctionByAuctionIdAndProductIdAsync(auctionId, productDetailsModel.Id);
productBidBoxViewModel.IsAdmin = await _customerService.IsAdminAsync(customer);
productBidBoxViewModel.IsGuest = await _customerService.IsGuestAsync(customer);
productBidBoxViewModel.AuctionClosed = auction.Closed;
productBidBoxViewModel.WidgetZone = widgetZone; productBidBoxViewModel.WidgetZone = widgetZone;
productBidBoxViewModel.BasePrice = productDetailsModel.ProductPrice.OldPriceValue; productBidBoxViewModel.BasePrice = productDetailsModel.ProductPrice.OldPriceValue;
productBidBoxViewModel.CurrentPrice = productDetailsModel.ProductPrice.PriceValue; productBidBoxViewModel.CurrentPrice = productDetailsModel.ProductPrice.PriceValue;
productBidBoxViewModel.ProductToAuctionId = productToAuctionId.FirstOrDefault().Id; productBidBoxViewModel.ProductToAuctionsId = productToAuctionId.FirstOrDefault().Id;
productBidBoxViewModel.AuctionId = auctionId; productBidBoxViewModel.AuctionId = auctionId;
productBidBoxViewModel.CustomerId = customer.Id; productBidBoxViewModel.CustomerId = customer.Id;
productBidBoxViewModel.ProductId = productDetailsModel.Id; productBidBoxViewModel.ProductId = productDetailsModel.Id;

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

@ -1,4 +1,5 @@
using Nop.Web.Framework.Models; using Nop.Plugin.Misc.AuctionPlugin.Domains.Enums;
using Nop.Web.Framework.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -9,8 +10,11 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Models
{ {
public record ProductBidBoxViewModel: BaseNopModel public record ProductBidBoxViewModel: BaseNopModel
{ {
public int ProductToAuctionId { get; set; } public int ProductToAuctionsId { get; set; }
public bool IsAdmin { get; set; }
public bool IsGuest { get; set; }
public int AuctionId { get; set; } public int AuctionId { get; set; }
public bool AuctionClosed { get; set; }
public int ProductId { get; set; } public int ProductId { get; set; }
public int CustomerId { get; set; } public int CustomerId { get; set; }

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

@ -3,12 +3,13 @@
@* @Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(myObj) as String) *@ @* @Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(myObj) as String) *@
<style>
</style> @{
<div id="publicProductBidBox" class="bg-dark p-3"> if (!Model.IsGuest)
{
<div class="d-flex justify-content-between mb-3"> <div id="publicProductBidBox" class="p-3 bg-primary text-white">
<h4>This item is under auction!</h4>
<div class="d-flex justify-content-between">
<div> <div>
<strong>Base Price:</strong> <strong>Base Price:</strong>
<span class="value"> <span class="value">
@ -21,7 +22,7 @@
<span class="value">@String.Format("{0:c}", Model.LicitStep)</span> <span class="value">@String.Format("{0:c}", Model.LicitStep)</span>
</div> </div>
<div> <div>
<button id="signalRBidButton" class="btn btn-success" type="button"> <button id="signalRBidButton" class="btn btn-success" style="text-transform: uppercase;" type="button">
Bid @String.Format("{0:c}", Model.BidPrice) Bid @String.Format("{0:c}", Model.BidPrice)
</button> </button>
@* <button id="bidButton" class="btn btn-success"> @* <button id="bidButton" class="btn btn-success">
@ -39,6 +40,40 @@
<div id="bidFeedback" class="mt-3"></div> <div id="bidFeedback" class="mt-3"></div>
</div> </div>
if (Model.IsAdmin)
{
<div id="publicProductBidBoxAdmin" class="p-3 bg-primary text-white">
<h4>Manage auction!</h4>
<div id="bidBoxAdminButtons" class="d-flex justify-content-between mb-3">
<button id="signalRBidButton" class="btn btn-scondary" style="text-transform: uppercase;" type="button">
Activate item
</button>
<button id="signalRBidButton" class="btn btn-warning" style="text-transform: uppercase;" type="button">
First warning
</button>
</div>
</div>
}
else
{
<p>No access to admin level buttons</p>
}
}
else
{
<div id="publicProductBidBoxGuest" class="p-3 bg-primary text-white">
<h4>This item is under auction!</h4>
<div id="bidBoxGuestMessage" class="d-flex justify-content-between mb-3">
<p>Please log in or register to participate!</p>
</div>
</div>
}
}
<script> <script>
var pageViewModel = undefined; var pageViewModel = undefined;
$(document).ready(function () { $(document).ready(function () {
@ -48,48 +83,17 @@
console.log(pageViewModel.WidgetZone); console.log(pageViewModel.WidgetZone);
console.log(typeof sendMessageToServer); console.log(typeof sendMessageToServer);
// $('#bidButton').click(function () {
// const bidPrice = $('#bidPrice').val();
// // Validate bid price
// if (!bidPrice || parseInt(bidPrice) < @Model.CurrentPrice + @Model.LicitStep) {
// $('#bidFeedback').text('Bid price must be at least the current price plus the licit step.')
// .addClass('text-danger');
// return;
// }
// // AJAX POST to send the bid
// $.ajax({
// url: '/Auction/PlaceBid', // Ensure this endpoint exists in your controller
// type: 'POST',
// contentType: 'application/json',
// data: JSON.stringify({
// auctionId: pageViewModel.AuctionId,
// bidPrice: bidPrice,
// customerId: dataObject.CustomerId,
// productId: dataObject.ProductId
// }),
// success: function (response) {
// $('#bidFeedback').text(response.message).removeClass('text-danger').addClass('text-success');
// },
// error: function (xhr) {
// $('#bidFeedback').text('Failed to place bid: ' + xhr.responseText)
// .addClass('text-danger');
// }
// });
// });
$("#signalRBidButton").on("click", function () { $("#signalRBidButton").on("click", function () {
document.getElementById("signalRBidButton").disabled = true; document.getElementById("signalRBidButton").disabled = true;
event.preventDefault(); event.preventDefault();
var bidMessage = { var bidMessage = {
AuctionId: pageViewModel.AuctionId.toFixed(), ProductAuctionMappingId: pageViewModel.ProductToAuctions,
BidPrice: pageViewModel.BidPrice.toFixed(2), AuctionId: pageViewModel.AuctionId,
ProductId: pageViewModel.ProductId.toFixed(), BidPrice: pageViewModel.BidPrice,
CustomerId: pageViewModel.CustomerId.toFixed() ProductId: pageViewModel.ProductId,
CustomerId: pageViewModel.CustomerId
}; };
sendMessageToServer("BidRequestMessage", bidMessage); sendMessageToServer("BidRequestMessage", bidMessage);
@ -101,22 +105,7 @@
}); });
function refreshPublicBidBox(data) { function refreshPublicBidBox(data) {
// $.ajax({
// url: '/Auction/RefreshAuctionWidget', // Controller endpoint
// type: 'POST',
// contentType: 'application/json',
// data: JSON.stringify({
// WidgetZone: pageViewModel.WidgetZone,
// ProductId: pageViewModel.ProductId
// }),
// success: function (response) {
// //$('#auction-widget').html(response); // Update the DOM element
// console.log("Auction widget refreshed!");
// },
// error: function (error) {
// console.error("Error refreshing auction widget:", error);
// }
// });
var widgetPriceElement = document.getElementById("price-value-" + pageViewModel.ProductId); var widgetPriceElement = document.getElementById("price-value-" + pageViewModel.ProductId);
var budButtonElement = document.getElementById("signalRBidButton"); var budButtonElement = document.getElementById("signalRBidButton");