Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Update PluginExtensions
KrzysztofPajak7b3c4c31b775
diff --git a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs b/src/Web/Grand.Web.Admin/Controllers/PaymentController.csindex dbc425d81..944ee0bc0 100644--- a/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PaymentController.cs@@ -83,7 +83,7 @@ public class PaymentController : BaseAdminControllerif (plugin != null){tmp.ConfigurationUrl = plugin.ConfigurationUrl();- tmp.LogoUrl = pluginInfo.GetLogoUrl(_workContext);+ tmp.LogoUrl = pluginInfo.GetLogoUrl(_workContext.CurrentHost.Url);}}diff --git a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs b/src/Web/Grand.Web.Admin/Controllers/PluginController.csindex cffd55a09..516ebea50 100644--- a/src/Web/Grand.Web.Admin/Controllers/PluginController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/PluginController.cs@@ -44,7 +44,7 @@ public class PluginController({var pluginModel = PluginInfo.ToModel();//logo- pluginModel.LogoUrl = PluginInfo.GetLogoUrl(workContext);+ pluginModel.LogoUrl = PluginInfo.GetLogoUrl(workContext.CurrentHost.Url);//configuration URLsif (PluginInfo.Installed)diff --git a/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs b/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.csindex 2ddcba936..131cb3e18 100644--- a/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs+++ b/src/Web/Grand.Web.Admin/Extensions/PluginExtensions.cs@@ -1,24 +1,19 @@-using Grand.Infrastructure;-using Grand.Infrastructure.Plugins;+using Grand.Infrastructure.Plugins;namespace Grand.Web.Admin.Extensions;public static class PluginExtensions{- public static string GetLogoUrl(this PluginInfo pluginDescriptor, IWorkContext workContext)+ public static string GetLogoUrl(this PluginInfo pluginDescriptor, string url){- ArgumentNullException.ThrowIfNull(pluginDescriptor);- ArgumentNullException.ThrowIfNull(workContext);-if (pluginDescriptor.OriginalAssemblyFile?.Directory == null) return null;- var storeLocation = workContext.CurrentHost.Url.TrimEnd('/');+ var storeLocation = url.TrimEnd('/');var pluginDirectory = pluginDescriptor.OriginalAssemblyFile.Directory;var logoPluginJpg = Path.Combine(pluginDirectory.FullName, "logo.jpg");if (File.Exists(logoPluginJpg))- return $"{storeLocation}/{pluginDirectory.Parent.Name}/{pluginDirectory.Name}/logo.jpg";+ return $"{storeLocation}/{pluginDirectory.Parent?.Name}/{pluginDirectory.Name}/logo.jpg";var logoPluginPng = Path.Combine(pluginDirectory.FullName, "logo.png");- if (File.Exists(logoPluginPng))- return $"{storeLocation}/{pluginDirectory.Parent.Name}/{pluginDirectory.Name}/logo.png";- return null;++ return File.Exists(logoPluginPng) ? $"{storeLocation}/{pluginDirectory.Parent?.Name}/{pluginDirectory.Name}/logo.png" : null;}}\ No newline at end of file