From 6d55bb3d43c665ec067dce9d19a2b22db2e8ccea Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 24 Nov 2024 19:37:27 +0100 Subject: [PATCH 1/2] hjkljlhkl --- .../Content/Js/MgMessageHandler.js | 1 + .../Controllers/AuctionController.cs | 5 ++++- .../Views/LiveScreen.cshtml | 8 ++++---- .../Views/Product/_ProductSpecifications.cshtml | 16 ++++++++-------- .../Views/PublicProductBidBox.cshtml | 5 +---- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js index ccfdd5c..1998a57 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js +++ b/Nop.Plugin.Misc.AuctionPlugin/Content/Js/MgMessageHandler.js @@ -31,6 +31,7 @@ console.log(data); var myObject = JSON.parse(data); console.log(myObject); + var publicProductBidBox = document.getElementById("publicProductBidBox"); var liveScreen = document.getElementById("auctionProductLiveScreenBox"); if (publicProductBidBox) diff --git a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs index 72646a9..c7c8fe2 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Controllers/AuctionController.cs @@ -80,7 +80,10 @@ public class AuctionController : BasePluginController var auctionDto = await _auctionService.GetAuctionDtoWithAuctionBids(auctionId, true); var activeMapping = auctionDto?.ProductToAuctionDtos.MinBy(x => x.SortIndex); var isAnyItemLive = activeMapping != null; - + if (auctionDto == null) + { + return new RedirectResult("/", false); + } var model = new LiveScreenViewModel(auctionDto); Product product; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml index 7e3887a..b16952d 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/LiveScreen.cshtml @@ -59,7 +59,7 @@