diff --git a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/LiveAnnouncement.js b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/LiveAnnouncement.js index 48b6a03..70a4829 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/LiveAnnouncement.js +++ b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/LiveAnnouncement.js @@ -67,7 +67,7 @@ MessageType: messageType, SenderId: senderId, RequestCount: window.RequestCount, - RequestId: getRequestId(), + RequestId: window.getRequestId(), Data: messageWrapperData }; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js index 7569af6..a8d21c9 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js +++ b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js @@ -47,7 +47,13 @@ if (publicProductBidBox) { //var audio = new Audio('../Plugins/Misc.AuctionPlugin/Content/ding.mp3'); //audio.play(); - refreshPublicBidBox(bidNotification, messageWrapper.RequestId == window.getRequestId()); + + var lastRequestId = window.getRequestId(); + var isMyRequest = messageWrapper.requestId == lastRequestId; + + console.log("isMyRequest: " + isMyRequest + "; lastRequestId: " + lastRequestId + "; messageWrapper.RequestId: " + messageWrapper.requestId); + + refreshPublicBidBox(bidNotification, isMyRequest); } if (publicInfo) { var functionName = "refreshPublicInfo" + productToAuctionDto.productId; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml index 361ced2..cc12d94 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml @@ -7,675 +7,668 @@ @* @Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(myObj) as String) *@ @{ - if (!Model.IsGuest) - { - if (Model.FirstProductToAuction != null) - { + 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") - }; + 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; -
No access to admin level buttons
- } - } - } - else - { -No access to admin level buttons
+ } + } + } + else + { +@T("Plugins.Misc.AuctionPlugin.PleaseLogInOrRegister")
-@T("Plugins.Misc.AuctionPlugin.PleaseLogInOrRegister")
+