From 29adf2772ad7c25c56c6b96d0c562ff9c9b3aaf5 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 21 Nov 2024 11:51:31 +0100 Subject: [PATCH] wtf javascript error fix, ViewModel being empty on document.ready --- .../Components/AuctionPublicViewComponent.cs | 7 +-- .../Models/ProductBidBoxViewModel.cs | 4 +- .../Views/PublicProductBidBox.cshtml | 60 ++++++++++--------- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs index 2522d9f..3570db0 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs @@ -144,13 +144,12 @@ public class AuctionPublicViewComponent : NopViewComponent productBidBoxViewModel.IsAdmin = await _customerService.IsAdminAsync(customer); productBidBoxViewModel.IsGuest = await _customerService.IsGuestAsync(customer); - productBidBoxViewModel.AuctionClosed = auction.Closed; - productBidBoxViewModel.Status = productToAuctionId.FirstOrDefault().AuctionStatus; - + productBidBoxViewModel.AuctionClosed = auction.Closed; + productBidBoxViewModel.IsItemActive = isActive; productBidBoxViewModel.WidgetZone = widgetZone; productBidBoxViewModel.BasePrice = productDetailsModel.ProductPrice.OldPriceValue; productBidBoxViewModel.CurrentPrice = productDetailsModel.ProductPrice.PriceValue; - productBidBoxViewModel.ProductToAuctionsId = productToAuctionId.FirstOrDefault().Id; + productBidBoxViewModel.ProductToAuctionId = productToAuctionId.FirstOrDefault().Id; productBidBoxViewModel.AuctionId = auctionId; productBidBoxViewModel.CustomerId = customer.Id; productBidBoxViewModel.ProductId = productDetailsModel.Id; diff --git a/Nop.Plugin.Misc.AuctionPlugin/Models/ProductBidBoxViewModel.cs b/Nop.Plugin.Misc.AuctionPlugin/Models/ProductBidBoxViewModel.cs index 1ecc510..21ced3e 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Models/ProductBidBoxViewModel.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Models/ProductBidBoxViewModel.cs @@ -10,12 +10,12 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Models { public record ProductBidBoxViewModel: BaseNopModel { - public int ProductToAuctionsId { get; set; } + public int ProductToAuctionId { get; set; } public bool IsAdmin { get; set; } public bool IsGuest { get; set; } public int AuctionId { get; set; } public bool AuctionClosed { get; set; } - public AuctionStatus Status { get; set; } + public bool IsItemActive { get; set; } public int ProductId { get; set; } public int CustomerId { get; set; } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml index 97867f5..8ea9a77 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml @@ -1,5 +1,5 @@ @model ProductBidBoxViewModel -@inject IJsonHelper JsonHelper; +@* @inject IJsonHelper JsonHelper; *@ @* @Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(myObj) as String) *@ @@ -75,32 +75,38 @@ }