Skip to content

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.

Admin panel - allow to manager shipping providers by store (is active)

KrzysztofPajak270702b2726e
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.cshtml
index 998de5de5..37a6fa338 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
@@ -13,6 +13,13 @@
</div>
<vc:admin-widget widget-zone="shipping_provider_list_buttons" additional-data="null" />
</div>
+ <div class="x_content">
+ <div class="form-horizontal">
+ <div class="form-body">
+ @await Component.InvokeAsync("StoreScope")
+ </div>
+ </div>
+ </div>
<div class="x_content form">
<div class="form-horizontal">
<div class="form-body">
diff --git a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
index 945405594..4eb61b256 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ShippingController.cs
@@ -148,9 +148,11 @@ namespace Grand.Web.Admin.Controllers
public IActionResult Providers() => View();
[HttpPost]
- public IActionResult Providers(DataSourceRequest command)
+ public async Task<IActionResult> Providers(DataSourceRequest command)
{
- var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>();
+ var storeScope = await GetActiveStore();
+
+ var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>(storeScope);
var shippingProvidersModel = new List<ShippingRateComputationMethodModel>();
var shippingProviders = _shippingService.LoadAllShippingRateCalculationProviders();
foreach (var shippingProvider in shippingProviders)
@@ -172,7 +174,9 @@ namespace Grand.Web.Admin.Controllers
[HttpPost]
public async Task<IActionResult> ProviderUpdate(ShippingRateComputationMethodModel model)
{
- var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>();
+ var storeScope = await GetActiveStore();
+
+ var _shippingProviderSettings = _settingService.LoadSetting<ShippingProviderSettings>(storeScope);
var srcm = _shippingService.LoadShippingRateCalculationProviderBySystemName(model.SystemName);
if (srcm.IsShippingRateMethodActive(_shippingProviderSettings))
@@ -181,7 +185,7 @@ namespace Grand.Web.Admin.Controllers
{
//mark as disabled
_shippingProviderSettings.ActiveSystemNames.Remove(srcm.SystemName);
- await _settingService.SaveSetting(_shippingProviderSettings);
+ await _settingService.SaveSetting(_shippingProviderSettings, storeScope);
}
}
else
@@ -190,7 +194,7 @@ namespace Grand.Web.Admin.Controllers
{
//mark as active
_shippingProviderSettings.ActiveSystemNames.Add(srcm.SystemName);
- await _settingService.SaveSetting(_shippingProviderSettings);
+ await _settingService.SaveSetting(_shippingProviderSettings, storeScope);
}
}
return new JsonResult("");