diff --git a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Views/AdminProductAuctionSettingsBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Views/AdminProductAuctionSettingsBox.cshtml index a8bbc18..e39beb8 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Views/AdminProductAuctionSettingsBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Views/AdminProductAuctionSettingsBox.cshtml @@ -1,6 +1,6 @@ @model ProductAssignToAuctionViewModel
-

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

+

@T("Plugins.Misc.AuctionPlugin.Admin.AssignToAuction")

Assign Product to Auction

@@ -8,7 +8,7 @@ - + - +
diff --git a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js index da56958..8494947 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js +++ b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js @@ -31,9 +31,9 @@ var audio = new Audio('../Plugins/Misc.AuctionPlugin/Content/ding.mp3'); audio.play(); - //console.log(data); + console.log(data); var myObject = JSON.parse(data); - //console.log(myObject); + console.log(myObject); var auctionDto = myObject.auctionDto; var productToAuctionDto = auctionDto.productToAuctionDtos[0]; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml index 82fbfa2..655d6b1 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml @@ -48,7 +48,16 @@

@Model.ActiveProductDetails.Name

-

Created by: @Model.ActiveProductDetails.ProductManufacturers.FirstOrDefault().Name

+ @if(Model.ActiveProductDetails.ProductManufacturers != null) + { + if(Model.ActiveProductDetails.ProductManufacturers.FirstOrDefault() != null) + { + if(!string.IsNullOrEmpty(Model.ActiveProductDetails.ProductManufacturers.FirstOrDefault().Name)) + { +

Created by: @Model.ActiveProductDetails.ProductManufacturers.FirstOrDefault().Name

+ } + } + }

Item no.: @Model.CurrentProductToAuction.SortIndex

diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml index 7ccce82..6544145 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml @@ -60,18 +60,18 @@ console.log("isActive: " + isActive); productItem.prepend('

' + - 'LIVE RIGTH NOW' + - '

' + + '" class="bg-success p-1 text-white text-center" style="position: absolute; width: calc(100% - 1rem); height: 50px; z-index: 1;">

' + + '@T("Plugins.Misc.AuctionPlugin.LiveNow")' + + '

' + "No.: " + productToAuctionDto.sortIndex + '
'); } else { console.log("isActive: " + isActive); productItem.prepend('

' + + '" class="bg-primary p-1 text-white text-center" style="position: absolute; width: calc(100% - 1rem); height: 50px; z-index: 1;">

' + resultDate.toLocaleString() + - '

' + + '

' + "No.: " + productToAuctionDto.sortIndex + '
'); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml index 362fc2b..f5a77b9 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml @@ -18,9 +18,9 @@ var title = auctionStatus switch { - AuctionStatus.Sold => lastBidIsMine ? "You're the winner!" : "Sold", - AuctionStatus.NotSold => "Finished", - _ => lastBidIsMine ? "Your bid is leading" : "Place a bid!" + 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") };
@@ -32,7 +32,7 @@
-
@(string.IsNullOrEmpty(Model.LastProductUrl) ? "Start of list" : "Back to last")
+
@(string.IsNullOrEmpty(Model.LastProductUrl) ? @T("Plugins.Misc.AuctionPlugin.StartOfList") : @T("Plugins.Misc.AuctionPlugin.BackToLast"))

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

@@ -48,7 +48,7 @@
-
@(string.IsNullOrEmpty(Model.NextProductUrl) ? "End of list" : "Coming up next...")
+
@(string.IsNullOrEmpty(Model.NextProductUrl) ? @T("Plugins.Misc.AuctionPlugin.EndOfList") : @T("Plugins.Misc.AuctionPlugin.ComingUp"))

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

@@ -58,6 +58,7 @@
+

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

@title

@@ -73,7 +74,7 @@
@*
} @@ -343,7 +344,7 @@ list = bidBox.classList; list.add("bg-success"); list.remove("bg-primary"); - bidButtonElement.textContent = "Good job"; + bidButtonElement.textContent = "@(T("Plugins.Misc.AuctionPlugin.GoodJob"))"; bidBoxTitle.textContent = productToAuction.auctionStatus == AuctionStatus.Sold ? "You're the winner!" : "Your bid is leading!"; if (bidBoxPageViewModel.IsAdmin) { console.log("I AM WEASEL!!! " + bidBoxPageViewModel.IsAdmin); @@ -359,7 +360,7 @@ list.add("bg-primary"); list.remove("bg-success"); bidBoxTitle.textContent = productToAuction.auctionStatus == AuctionStatus.Sold ? "Sold" : "Place a bid!"; - bidButtonElement.textContent = "Bid " + HUFFormatter.format(bidBoxPageViewModel.NextBidPrice); + bidButtonElement.textContent = "@(T("Plugins.Misc.AuctionPlugin.BidButtonPrefix")) " + HUFFormatter.format(bidBoxPageViewModel.NextBidPrice); }