diff --git a/Nop.Plugin.Misc.AuctionPlugin/Content/ding.mp3 b/Nop.Plugin.Misc.AuctionPlugin/Content/ding.mp3 index 7cb10c5..e35c4f2 100644 Binary files a/Nop.Plugin.Misc.AuctionPlugin/Content/ding.mp3 and b/Nop.Plugin.Misc.AuctionPlugin/Content/ding.mp3 differ diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml index 6544145..c546a8e 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml @@ -54,7 +54,11 @@ console.log("dates: " + myDate + ", " + fixedDate); let resultDate = new Date(fixedDate); console.log("dates: " + myDate + ", " + fixedDate + ", " + resultDate); - + let options = { + year: "numeric", month: "numeric", + day: "numeric", hour: "2-digit", minute: "2-digit" + }; + let status = productToAuctionDto.auctionStatus; // Add a new div as the first child if (isActive) { console.log("isActive: " + isActive); @@ -65,16 +69,28 @@ '

' + "No.: " + productToAuctionDto.sortIndex + ''); - } else { + } + else if (status == AuctionStatus.Sold || status == AuctionStatus.NotSold) { console.log("isActive: " + isActive); productItem.prepend('

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

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

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

' + + resultDate.toLocaleString([], options) + + '

' + + "No.: " + productToAuctionDto.sortIndex + + '
'); + + } } else { console.error("Product item not found with productId:", productId); diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml index bb3659a..3c8fa57 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml @@ -58,21 +58,21 @@
-

#@Model.AuctionDto.ProductToAuctionDtos.FirstOrDefault().SortIndex

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

@title

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