diff --git a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js index fe5b763..48a93e4 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js +++ b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js @@ -58,7 +58,7 @@ { var audio = new Audio('../../Plugins/Misc.AuctionPlugin/Content/ding.mp3'); audio.play(); - updateOnBid(); + updateOnBid(myObject); } else { toastr.success(`

${myObject.currentPrice}

${myObject.productName}

`, "New bid arrived", { diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml index 5cee3dc..82b8def 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml @@ -25,8 +25,8 @@
Auction Item Image
-
-
+
+
Bid History
@@ -82,7 +82,7 @@
Actual licit step - @($"{Model.LicitStep:c}") + @($"{Model.LicitStep:c}")
@@ -96,7 +96,7 @@
Current state price -

+

@($"{Model.CurrentPrice:c}")

@@ -167,13 +167,13 @@ var row = table.insertRow(); var cell1 = row.insertCell(); - cell1.textContent = tableRow.Id; + cell1.textContent = "#"; var cell2 = row.insertCell(); - cell2.textContent = tableRow.BidPrice; + cell2.textContent = HUFFormatter.format(tableRow.BidPrice); var cell3 = row.insertCell(); - cell3.textContent = tableRow.CustomerId; + cell3.textContent = "###"; } @@ -185,6 +185,27 @@ console.log(data); let auctionDto = data.auctionDto; let productToAuction = auctionDto.productToAuctionDtos[0]; + + var liveScreenLicitStep = document.getElementById("liveScreenLicitStep"); + if(liveScreenLicitStep) { + liveScreenLicitStep.textContent = data.nextStepAmount; + } + var liveScreenCurrentPrice = document.getElementById("liveScreenCurrentPrice"); + if (liveScreenCurrentPrice) { + liveScreenCurrentPrice.textContent= HUFFormatter.format(productToAuction.currentPrice); + } + console.log(productToAuction); + var table = document.getElementById("bidHistoryTable"); + var row = table.insertRow(1); + + var cell1 = row.insertCell(); + cell1.textContent = "#"; + + var cell2 = row.insertCell(); + cell2.textContent = HUFFormatter.format(productToAuction.currentPrice); + + var cell3 = row.insertCell(); + cell3.textContent = "###"; } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml index f5a77b9..bb3659a 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml @@ -7,532 +7,532 @@ @{ - if (!Model.IsGuest) - { - if (Model.FirstProductToAuction != null) - { - var bgClass = Model.FirstProductToAuction.WinnerCustomerId == Model.CustomerId ? "bg-success" : "bg-primary"; - var bidButtonActive = Model.IsItemActive && (Model.FirstProductToAuction.WinnerCustomerId != Model.CustomerId || Model.IsAdmin); - var auctionStatus = Model.FirstProductToAuction.AuctionStatus; - var lastBidIsMine = Model.FirstProductToAuction.WinnerCustomerId == Model.CustomerId; - - var title = auctionStatus switch - { - AuctionStatus.Sold => lastBidIsMine ? @T("Plugins.Misc.AuctionPlugin.YouWin") : @T("Plugins.Misc.AuctionPlugin.Sold"), - AuctionStatus.NotSold => @T("Plugins.Misc.AuctionPlugin.Finished"), - _ => lastBidIsMine ? @T("Plugins.Misc.AuctionPlugin.YourBidLeading") : @T("Plugins.Misc.AuctionPlugin.PlaceABid") - }; - -
- -
-
-
- ... -
-
-
-
@(string.IsNullOrEmpty(Model.LastProductUrl) ? @T("Plugins.Misc.AuctionPlugin.StartOfList") : @T("Plugins.Misc.AuctionPlugin.BackToLast"))
-

@(string.IsNullOrEmpty(Model.LastProductName) ? "---" : Model.LastProductName)

-
-
-
-
- - - -
-
-
- ... -
-
-
-
@(string.IsNullOrEmpty(Model.NextProductUrl) ? @T("Plugins.Misc.AuctionPlugin.EndOfList") : @T("Plugins.Misc.AuctionPlugin.ComingUp"))
-

@(string.IsNullOrEmpty(Model.NextProductName) ? "---" : Model.NextProductName)

-
-
-
-
- - -
-
-

Item no.: @Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault().SortIndex

-

@title

-
-
- Base Price: - - @($"{Model.BasePrice:c}") - @* @(decimal?.Round(Model.BasePrice, 2, MidpointRounding.AwayFromZero)) *@ - -
-
- Bid Step: - @($"{Model.LicitStep:c}") -
-
- - @* *@ -
-
- - - @* *@ - -
-
- - - if (Model.IsAdmin) - { -
-

Manage auction!

-
- - -
- - - - -
-
- - - -
- - -
-
- } - else - { - //

No access to admin level buttons

- } - } - } - else - { -
-

This item is under auction!

-
- -

@T("Plugins.Misc.AuctionPlugin.PleaseLogInOrRegister")

-
-
- } - } - - \ No newline at end of file + if (widgetPriceElement) { + + if (productAuctionMappingId == bidBoxPageViewModel.ProductToAuctionId) { + console.log("THIS IS FOR US! SORRY FOR SHOUTING"); + + widgetPriceElement.textContent = HUFFormatter.format(data.currentPrice); // Update the price + licitStepElement.textContent = HUFFormatter.format(data.nextStepAmount); + bidBoxPageViewModel.NextBidPrice = Number(data.nextBidPrice); + bidButtonElement.disabled = false; + var list; + if (isMyBid) { + console.log("This is my bid"); + list = bidBox.classList; + list.add("bg-success"); + list.remove("bg-primary"); + bidButtonElement.textContent = "@(T("Plugins.Misc.AuctionPlugin.GoodJob"))"; + bidBoxTitle.textContent = productToAuction.auctionStatus == AuctionStatus.Sold ? "@(T("Plugins.Misc.AuctionPlugin.YouWin"))" : "@(T("Plugins.Misc.AuctionPlugin.YourBidLeading"))"; + if (bidBoxPageViewModel.IsAdmin) { + console.log("I AM WEASEL!!! " + bidBoxPageViewModel.IsAdmin); + bidButtonElement.disabled = false; + } + else { + console.log("I AM NOT WEASEL!!! " + bidBoxPageViewModel.IsAdmin); + bidButtonElement.disabled = true; + } + } + else { + list = bidBox.classList; + list.add("bg-primary"); + list.remove("bg-success"); + bidBoxTitle.textContent = productToAuction.auctionStatus == AuctionStatus.Sold ? "@(T("Plugins.Misc.AuctionPlugin.Sold"))" : "@(T("Plugins.Misc.AuctionPlugin.PlaceABid"))"; + bidButtonElement.textContent = "@(T("Plugins.Misc.AuctionPlugin.BidButtonPrefix")) " + HUFFormatter.format(bidBoxPageViewModel.NextBidPrice); + + } + + console.log(`WidgetPrice updated to: ${data.currentPrice}, next bid is ${bidBoxPageViewModel.NextBidPrice}`); + //bidButtonElement.disabled = false; + + } + + else { + console.log("Not for this product"); + } + + + } else { + console.warn("Element with ID 'WidgetPrice' not found in the DOM."); + } + } + + function handleAuctionUpdate(data) { + var widgetPriceElement = document.getElementById("price-value-" + bidBoxPageViewModel.ProductId); + var bidBoxTitle = document.getElementById("bidBoxTitle"); + var productAuctionMappingId = data.auctionDto.productToAuctionDtos[0].id; + + //TODO: TESZT STATUS!!! - JTEST. + var itemStatus = data.auctionDto.productToAuctionDtos[0].auctionStatus; + //var itemStatus = AuctionStatus.TEST; + + console.log("handle auction update called" + productAuctionMappingId); + console.log("auction status:" + itemStatus); + if (widgetPriceElement) { + + if (productAuctionMappingId == bidBoxPageViewModel.ProductToAuctionId) { + console.log("THIS IS FOR US! SORRY FOR SHOUTING"); + + if (itemStatus == AuctionStatus.None) { + bidBoxTitle.textContent = "The auction has not started yet"; + } + else if (itemStatus == AuctionStatus.Pause) { + bidBoxTitle.textContent = "The auction is paused! Please hold on..."; + } + else if (itemStatus == AuctionStatus.FirstWarning) { + bidBoxTitle.textContent = "First warning!"; + } + else if (itemStatus == AuctionStatus.SecondWarning) { + bidBoxTitle.textContent = "Second warning! Hurry up!"; + } + + setButtons(itemStatus); + + console.log(`WidgetPrice updated to: ${data.currentPrice}, next bid is ${bidBoxPageViewModel.NextBidPrice}`); + + + } + + else { + console.log("Not for this product"); + } + + + } else { + console.warn("Element with ID 'WidgetPrice' not found in the DOM."); + } + } + + + function setButtons(auctionStatus) { + console.log("SetButtons called: " + auctionStatus); + + // Button IDs and their default states for each AuctionStatus + //true = disabled + var buttonStates = { + [AuctionStatus.None]: { + signalRBidButton: true, + signalRFirstWarningButton: true, + signalRSecondWarningButton: true, + signalROpenItemButton: false, + signalRCloseItemButton: true, + signalRPauseItemButton: true, + signalRRevertBidButton: true, + signalRResetItemButton: true, + }, + [AuctionStatus.Active]: { + signalRBidButton: false, + signalRFirstWarningButton: false, + signalRSecondWarningButton: true, + signalROpenItemButton: true, + signalRCloseItemButton: true, + signalRPauseItemButton: false, + signalRRevertBidButton: true, + signalRResetItemButton: true, + }, + [AuctionStatus.FirstWarning]: { + signalRBidButton: false, + signalRFirstWarningButton: true, + signalRSecondWarningButton: false, + signalROpenItemButton: true, + signalRCloseItemButton: true, + signalRPauseItemButton: false, + signalRRevertBidButton: true, + signalRResetItemButton: true, + }, + [AuctionStatus.SecondWarning]: { + signalRBidButton: false, + signalRFirstWarningButton: true, + signalRSecondWarningButton: true, + signalROpenItemButton: true, + signalRCloseItemButton: false, + signalRPauseItemButton: false, + signalRRevertBidButton: true, + signalRResetItemButton: true, + }, + [AuctionStatus.Pause]: { + signalRBidButton: true, + signalRFirstWarningButton: true, + signalRSecondWarningButton: true, + signalROpenItemButton: false, + signalRCloseItemButton: true, + signalRPauseItemButton: true, + signalRRevertBidButton: false, + signalRResetItemButton: false, + }, + [AuctionStatus.Sold]: { + signalRBidButton: true, + signalRFirstWarningButton: true, + signalRSecondWarningButton: true, + signalROpenItemButton: true, + signalRCloseItemButton: true, + signalRPauseItemButton: true, + signalRRevertBidButton: true, + signalRResetItemButton: true, + }, + [AuctionStatus.NotSold]: { + signalRBidButton: true, + signalRFirstWarningButton: true, + signalRSecondWarningButton: true, + signalROpenItemButton: true, + signalRCloseItemButton: true, + signalRPauseItemButton: true, + signalRRevertBidButton: false, + signalRResetItemButton: false, + }, + [AuctionStatus.TEST]: { + signalRBidButton: false, + signalRFirstWarningButton: false, + signalRSecondWarningButton: false, + signalROpenItemButton: false, + signalRCloseItemButton: false, + signalRPauseItemButton: false, + signalRRevertBidButton: false, + signalRResetItemButton: false, + }, + + }; + + // Get the states for the given auctionStatus + var states = buttonStates[auctionStatus]; + if (!states) { + console.error("Unknown AuctionStatus: ", auctionStatus); + return; + } + + // Apply the states to each button + Object.keys(states).forEach((buttonId) => { + var button = document.getElementById(buttonId); + if (button) { + button.disabled = states[buttonId]; + button.hidden = states[buttonId]; + } else { + console.warn(`Button with ID ${buttonId} not found.`); + } + }); + } + + + \ No newline at end of file