diff --git a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs index 1c18d03..105b709 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Areas/Admin/Controllers/AnnouncementController.cs @@ -92,7 +92,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Controllers model.Body = singleAnnouncement.Body; model.IsActive = singleAnnouncement.IsActive; - return View("~/Plugins/Widget.LiveAnnouncement/Views/LiveAnnouncementView/Announcement.cshtml", model); + return View("~/Plugins/Misc.AuctionPlugin/Areas/Admin/Views/Announcement.cshtml", model); } @@ -107,7 +107,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin.Areas.Admin.Controllers public IActionResult AnnouncementList() { var model = new AnnouncementViewModel(); - return View("~/Plugins/Misc.Auction/Areas/Admin/Views/AnnouncementList.cshtml", model); + return View("~/Plugins/Misc.AuctionPlugin/Areas/Admin/Views/AnnouncementList.cshtml", model); } //[HttpPost] diff --git a/Nop.Plugin.Misc.AuctionPlugin/AuctionDefaults.cs b/Nop.Plugin.Misc.AuctionPlugin/AuctionDefaults.cs index c6ef71c..4ecd9a7 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/AuctionDefaults.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/AuctionDefaults.cs @@ -10,7 +10,7 @@ public static class AuctionDefaults /// /// Gets the system name /// - public static string SystemName => "Misc.AuctionPlugin"; + public static string SystemName => "AuctionPlugin"; /// /// Gets the user agent used to request third-party services diff --git a/Nop.Plugin.Misc.AuctionPlugin/AuctionPlugin.cs b/Nop.Plugin.Misc.AuctionPlugin/AuctionPlugin.cs index 438ed17..6f151cf 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/AuctionPlugin.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/AuctionPlugin.cs @@ -99,7 +99,7 @@ namespace Nop.Plugin.Misc.AuctionPlugin { ArgumentNullException.ThrowIfNull(widgetZone); - if (widgetZone.Equals(PublicWidgetZones.ProductDetailsOverviewTop)) + if (widgetZone.Equals(PublicWidgetZones.ProductPriceTop)) { return typeof(AuctionPublicViewComponent); } @@ -116,11 +116,11 @@ namespace Nop.Plugin.Misc.AuctionPlugin { return Task.FromResult>(new List { - PublicWidgetZones.ProductDetailsOverviewTop, - PublicWidgetZones.OrderSummaryBillingAddress, + PublicWidgetZones.ProductPriceTop, + PublicWidgetZones.ProductDetailsBottom, - AdminWidgetZones.OrderBillingAddressDetailsBottom, - AdminWidgetZones.OrderShippingAddressDetailsBottom + //AdminWidgetZones.OrderBillingAddressDetailsBottom, + //AdminWidgetZones.OrderShippingAddressDetailsBottom }); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs index e4b7f36..284f3a2 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionPublicViewComponent.cs @@ -3,6 +3,7 @@ using Nop.Core; using Nop.Plugin.Misc.AuctionPlugin; using Nop.Services.Cms; using Nop.Services.Common; +using Nop.Services.Logging; using Nop.Web.Framework.Components; using Nop.Web.Framework.Infrastructure; using Nop.Web.Models.Catalog; @@ -20,6 +21,7 @@ public class AuctionPublicViewComponent : NopViewComponent protected readonly IWidgetPluginManager _widgetPluginManager; protected readonly IWorkContext _workContext; protected readonly AuctionSettings _auctionSettings; + protected readonly ILogger _logger; #endregion @@ -29,13 +31,15 @@ public class AuctionPublicViewComponent : NopViewComponent IGenericAttributeService genericAttributeService, IWidgetPluginManager widgetPluginManager, IWorkContext workContext, - AuctionSettings auctionSettings) + AuctionSettings auctionSettings, + ILogger logger) { _addressService = addressService; _genericAttributeService = genericAttributeService; _widgetPluginManager = widgetPluginManager; _workContext = workContext; _auctionSettings = auctionSettings; + _logger = logger; } #endregion @@ -53,25 +57,41 @@ public class AuctionPublicViewComponent : NopViewComponent /// public async Task InvokeAsync(string widgetZone, object additionalData) { + await _logger.InformationAsync("WidgetViewComponent called"); + //ensure that what3words widget is active and enabled var customer = await _workContext.GetCurrentCustomerAsync(); + await _logger.InformationAsync($"WidgetViewComponent customer: {customer.Email}"); + if (!await _widgetPluginManager.IsPluginActiveAsync(AuctionDefaults.SystemName, customer)) return Content(string.Empty); - if (!_auctionSettings.Enabled) - return Content(string.Empty); + await _logger.InformationAsync("WidgetViewComponent widget active"); + + //if (!_auctionSettings.Enabled) + // return Content(string.Empty); var productDetailsModel = additionalData as ProductDetailsModel; - - if (productDetailsModel is null) - return Content(string.Empty); - var productId = 0; - if (widgetZone.Equals(PublicWidgetZones.ProductDetailsTop)) - productId = productDetailsModel.Id; - + await _logger.InformationAsync($"WidgetViewComponent product: {productDetailsModel.Name}"); - return View("~/Plugins/Widgets.What3words/Views/PublicProductBidBox.cshtml", productId.ToString()); + //if (productDetailsModel is null) + //{ + + // await _logger.InformationAsync("WidgetViewComponent productdetailsmodel is null"); + // return Content(string.Empty); + //} + + if (!widgetZone.Equals(PublicWidgetZones.ProductPriceTop)) + { + await _logger.InformationAsync($"WidgetViewComponent is NOT in ProductDetailsTop now {widgetZone}"); + return Content(string.Empty); + } + + await _logger.InformationAsync("WidgetViewComponent called II"); + + + return View("~/Plugins/Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml", productDetailsModel.Id.ToString()); } #endregion diff --git a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs index db365ca..e6b4e22 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs +++ b/Nop.Plugin.Misc.AuctionPlugin/Components/AuctionViewComponent.cs @@ -49,16 +49,16 @@ public class AuctionViewComponent : NopViewComponent /// public async Task InvokeAsync(string widgetZone, object additionalData) { - + await _logger.InformationAsync("Auction widget called"); //ensure that a widget is active and enabled var customer = await _workContext.GetCurrentCustomerAsync(); - if (!await _widgetPluginManager.IsPluginActiveAsync(AuctionDefaults.SystemName, customer)) - return Content(string.Empty); + //if (!await _widgetPluginManager.IsPluginActiveAsync(AuctionDefaults.SystemName, customer)) + // return Content(string.Empty); - if (!_auctionSettings.Enabled) - return Content(string.Empty); + //if (!_auctionSettings.Enabled) + // return Content(string.Empty); if (string.IsNullOrEmpty(_auctionSettings.SomeText)) { @@ -74,7 +74,7 @@ public class AuctionViewComponent : NopViewComponent //} var model = new AuctionPublicInfoModel(); - if (!widgetZone.Equals(PublicWidgetZones.ProductDetailsTop)) + if (widgetZone.Equals(PublicWidgetZones.ProductDetailsBottom)) { model.Message = $"Auction plugin is active, setting = {_auctionSettings.SomeText}, productId = {((ProductDetailsModel)additionalData).Name}"; @@ -87,7 +87,7 @@ public class AuctionViewComponent : NopViewComponent } - return View("~/Plugins/Widgets.AuctionPlugin/Views/PublicInfo.cshtml", model); + return View("~/Plugins/Misc.AuctionPlugin/Views/PublicInfo.cshtml", model); } diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml index c74648c..90d678d 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicInfo.cshtml @@ -1,8 +1,9 @@ @model AuctionPublicInfoModel -
- +
+

Auction viewcomponent

+
-

@Model.Message

+

General widget info: @Model.Message

diff --git a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml index 6b71c09..67e5ac5 100644 --- a/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml +++ b/Nop.Plugin.Misc.AuctionPlugin/Views/PublicProductBidBox.cshtml @@ -1,11 +1,12 @@ @model string -
  • +
    +

    Auction Public Viewcomponent

    @T("Plugins.Misc.AuctionPlugin.BidBox.Field.Label"): @(Model) -
    • +