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; -
- -
-
- @*
+ + 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.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)

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

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

+
+
+
+
+ -
-
-
-
#@Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault()!.SortIndex
- -
+
+
+
+
#@Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault()!.SortIndex
+ +
-

@title

-
-
- Base Price: - @{ - if(Model.WorkingCurrency.CurrencyCode == "EUR") - { - - @($"{((decimal)Model.BasePriceInWorkingCurrency).ToString("C", new CultureInfo("de-DE"))}") - } - else - { - @($"{((decimal)Model.BasePrice).ToString("C", new CultureInfo("hu-HU"))}") - - } - } +

@title

+
+
+ Base Price: + @{ + if (Model.WorkingCurrency.CurrencyCode == "EUR") + { -
-
- Bid Step: - @{ - if (Model.WorkingCurrency.CurrencyCode == "EUR") - { - @($"{Model.LicitStepInWorkingCurrency.ToString("C", new CultureInfo("de-DE"))}") + @($"{((decimal)Model.BasePriceInWorkingCurrency).ToString("C", new CultureInfo("de-DE"))}") + } + else + { + @($"{((decimal)Model.BasePrice).ToString("C", new CultureInfo("hu-HU"))}") - } - else - { - // @($"{Model.LicitStep:c}") - @($"{Model.LicitStep.ToString("C", new CultureInfo("hu-HU"))}") - } - } + } + } -
-
-
+
+ Bid Step: + @{ + if (Model.WorkingCurrency.CurrencyCode == "EUR") + { + @($"{Model.LicitStepInWorkingCurrency.ToString("C", new CultureInfo("de-DE"))}") - } - else - { - // @($"{Model.LicitStep:c}") - - @T("Plugins.Misc.AuctionPlugin.BidButtonPrefix") @($"{Model.NextBidPrice.ToString("C", new CultureInfo("hu-HU"))}") - } - } - - - - - - - @*
+
+ + @* *@ -
-
+
+
- @* *@ -
-
+
+
- if (Model.IsAdmin) - { -
-

Manage auction!

-
+ if (Model.IsAdmin) + { +
+

Manage auction!

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

No access to admin level buttons

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

This item is under auction!

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

No access to admin level buttons

+ } + } + } + else + { +
+

This item is under auction!

+
-

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

-
-
- } +

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

+
+
+ } } \ No newline at end of file