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
IShippingRateCalculationProvider - fix for configuration URL - should be get from provider (not from plugin)
KrzysztofPajak8ff1c26c8add
diff --git a/src/Core/Grand.Infrastructure/Plugins/IProvider.cs b/src/Core/Grand.Infrastructure/Plugins/IProvider.csindex 313a915be..89ae86343 100644--- a/src/Core/Grand.Infrastructure/Plugins/IProvider.cs+++ b/src/Core/Grand.Infrastructure/Plugins/IProvider.cs@@ -7,7 +7,7 @@ namespace Grand.Infrastructure.Plugins/// <summary>/// Gets a configuration URL/// </summary>- string ConfigurationUrl { get; }+ string ConfigurationUrl { get; }/// <summary>/// Gets a system name for provider/// </summary>diff --git a/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs b/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.csindex f63ba0fb1..3acad9b83 100644--- a/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs+++ b/src/Plugins/Shipping.ByWeight/ByWeightShippingPlugin.cs@@ -89,17 +89,6 @@ namespace Shipping.ByWeight#endregion- #region Properties-- /// <summary>- /// Gets a configuration page URL- /// </summary>- public override string ConfigurationUrl()- {- return ByWeightShippingDefaults.ConfigurationUrl;- }-- #endregion}}diff --git a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.csindex 44c430424..424604ff1 100644--- a/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs+++ b/src/Plugins/Shipping.FixedRateShipping/FixedRateShippingPlugin.cs@@ -32,15 +32,7 @@ namespace Shipping.FixedRateShipping#endregion#region Methods-- /// <summary>- /// Gets a configuration page URL- /// </summary>- public override string ConfigurationUrl()- {- return FixedRateShippingDefaults.ConfigurationUrl;- }-+/// <summary>/// Install plugin/// </summary>diff --git a/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs b/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.csindex 97e978134..f811c7a98 100644--- a/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs+++ b/src/Plugins/Shipping.ShippingPoint/ShippingPointRatePlugin.cs@@ -94,14 +94,6 @@ namespace Shipping.ShippingPointawait base.Uninstall();}- /// <summary>- /// Gets a configuration page URL- /// </summary>- public override string ConfigurationUrl()- {- return ShippingPointRateDefaults.ConfigurationUrl;- }-#endregion}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Providers.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Providers.cshtmlindex bee8ac2d8..998de5de5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Providers.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shipping/Providers.cshtml@@ -53,7 +53,6 @@ $(document).ready(function () {fields: {FriendlyName: { editable: false, type: "string" },SystemName: { editable: false, type: "string" },- LogoUrl: { editable: false, type: "string" },DisplayOrder: { editable: false, type: "number" },IsActive: { editable: true, type: "boolean" }}@@ -94,11 +93,6 @@ $(document).ready(function () {title: "@Loc["Admin.Configuration.Payment.Methods.Fields.SystemName"]",width: 250,template: '<a class="k-link" href="#=ConfigurationUrl#">#=SystemName#</a>',- }, {- field: "LogoUrl",- title: "@Loc["Admin.Configuration.Payment.Methods.Fields.Logo"]",- width: 100,- template: '<img src="#=LogoUrl#" />'}, {field: "DisplayOrder",title: "@Loc["Admin.Configuration.Shipping.Providers.Fields.DisplayOrder"]",diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.csindex 74d6f9911..32c83f2b3 100644--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs@@ -157,17 +157,7 @@ namespace Grand.Web.Admin.Controllersforeach (var shippingProvider in shippingProviders){var tmp1 = shippingProvider.ToModel();- tmp1.IsActive = shippingProvider.IsShippingRateMethodActive(_shippingProviderSettings);- var pluginInfo = PluginManager.ReferencedPlugins.FirstOrDefault(x => x.SystemName == shippingProvider.SystemName);- if (pluginInfo != null)- {- var plugin = pluginInfo.Instance<IPlugin>(_serviceProvider);- if (plugin != null)- {- tmp1.ConfigurationUrl = plugin.ConfigurationUrl();- tmp1.LogoUrl = pluginInfo.GetLogoUrl(_workContext);- }- }+ tmp1.IsActive = shippingProvider.IsShippingRateMethodActive(_shippingProviderSettings);shippingProvidersModel.Add(tmp1);}shippingProvidersModel = shippingProvidersModel.ToList();@@ -207,32 +197,6 @@ namespace Grand.Web.Admin.Controllersreturn new JsonResult("");}- public IActionResult ConfigureProvider(string systemName)- {- var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>();-- var srcm = _shippingService.LoadShippingRateCalculationProviderBySystemName(systemName);- if (srcm == null)- //No Shipping rate method found with the specified id- return RedirectToAction("Providers");-- var model = srcm.ToModel();- model.IsActive = srcm.IsShippingRateMethodActive(_shippingProviderSettings);-- var pluginInfo = PluginManager.ReferencedPlugins.FirstOrDefault(x => x.SystemName == srcm.SystemName);- if (pluginInfo != null)- {- var plugin = pluginInfo.Instance<IPlugin>(_serviceProvider);- if (plugin != null)- {- model.ConfigurationUrl = plugin.ConfigurationUrl();- model.LogoUrl = pluginInfo.GetLogoUrl(_workContext);- }- }-- return View(model);- }-#endregion#region Shipping methodsdiff --git a/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.csindex 17b7f0f37..5c2745790 100644--- a/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs+++ b/src/Web/Grand.Web.Admin/Mapper/ShippingRateComputationMethodProfile.cs@@ -13,8 +13,8 @@ namespace Grand.Web.Admin.Mapper.ForMember(dest => dest.FriendlyName, mo => mo.MapFrom(src => src.FriendlyName)).ForMember(dest => dest.SystemName, mo => mo.MapFrom(src => src.SystemName)).ForMember(dest => dest.DisplayOrder, mo => mo.MapFrom(src => src.Priority))- .ForMember(dest => dest.IsActive, mo => mo.Ignore())- .ForMember(dest => dest.LogoUrl, mo => mo.Ignore());+ .ForMember(dest => dest.ConfigurationUrl, mo => mo.MapFrom(src => src.ConfigurationUrl))+ .ForMember(dest => dest.IsActive, mo => mo.Ignore());}public int Order => 0;diff --git a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingRateComputationMethodModel.cs b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingRateComputationMethodModel.csindex 503849b63..72a829958 100644--- a/src/Web/Grand.Web.Admin/Models/Shipping/ShippingRateComputationMethodModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Shipping/ShippingRateComputationMethodModel.cs@@ -19,9 +19,6 @@ namespace Grand.Web.Admin.Models.Shipping[GrandResourceDisplayName("Admin.Configuration.Shipping.Providers.Fields.IsActive")]public bool IsActive { get; set; }- [GrandResourceDisplayName("Admin.Configuration.Shipping.Providers.Fields.Logo")]- public string LogoUrl { get; set; }-[GrandResourceDisplayName("Admin.Configuration.Shipping.Providers.Configure")]public string ConfigurationUrl { get; set; }}diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 5fe52d65c..1cdd88f12 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -4917,9 +4917,6 @@<Resource Name="Admin.Configuration.Shipping.Providers.Fields.IsActive"><Value>Is active</Value></Resource>- <Resource Name="Admin.Configuration.Shipping.Providers.Fields.Logo">- <Value>Logo</Value>- </Resource><Resource Name="Admin.Configuration.Shipping.Providers.Fields.SystemName"><Value>System name</Value></Resource>