Fixed rate shipping configuration: Fixed "A public action method 'null' was not found on controller 'SmartStore.Admin.Controllers.ShippingController'"

mgesing · mgesing · commit dda3a5eae23f · 2014-07-15T18:14:40.000+02:00
diff --git a/src/Plugins/Shipping.FixedRate/Controllers/ShippingFixedRateController.cs b/src/Plugins/Shipping.FixedRate/Controllers/ShippingFixedRateController.cs
@@ -78,7 +78,10 @@ public ActionResult ShippingRateUpdate(FixedShippingRateModel model, GridCommand
             int shippingMethodId = model.ShippingMethodId;
             decimal rate = model.Rate;
 
-            _settingService.SetSetting(string.Format("ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{0}", shippingMethodId), rate);
+			if (shippingMethodId != 0)
+			{
+				_settingService.SetSetting(string.Format("ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{0}", shippingMethodId), rate);
+			}
 
             var tmp = new List<FixedShippingRateModel>();
             foreach (var shippingMethod in _shippingService.GetAllShippingMethods())
diff --git a/src/Plugins/Shipping.FixedRate/Description.txt b/src/Plugins/Shipping.FixedRate/Description.txt
@@ -1,6 +1,6 @@
 ﻿FriendlyName: Fixed Rate Shipping
 SystemName: Shipping.FixedRate
-Version: 1.3
+Version: 1.31
 MinAppVersion: 2.0.0
 DisplayOrder: 1
 FileName: SmartStore.Plugin.Shipping.FixedRate.dll
diff --git a/src/Plugins/Shipping.FixedRate/RouteProvider.cs b/src/Plugins/Shipping.FixedRate/RouteProvider.cs
@@ -8,9 +8,9 @@ public partial class RouteProvider : IRouteProvider
     {
         public void RegisterRoutes(RouteCollection routes)
         {
-            routes.MapRoute("Plugin.Shipping.FixedRate.Configure",
-                 "Plugins/ShippingFixedRate/Configure",
-                 new { controller = "ShippingFixedRate", action = "Configure" },
+            routes.MapRoute("Plugin.Shipping.FixedRate.Action",
+                 "Plugins/ShippingFixedRate/{action}",
+                 new { controller = "ShippingFixedRate" },
                  new[] { "SmartStore.Plugin.Shipping.FixedRate.Controllers" }
             )
 			.DataTokens["area"] = "Shipping.FixedRate";
diff --git a/src/Plugins/Shipping.FixedRate/Views/ShippingFixedRate/Configure.cshtml b/src/Plugins/Shipping.FixedRate/Views/ShippingFixedRate/Configure.cshtml
@@ -13,12 +13,12 @@
 				.DataKeys(keys => keys.Add(x => x.ShippingMethodId).RouteKey("ShippingMethodId"))
 				.Columns(columns =>
 				{
-					columns.Bound(x => x.ShippingMethodName).Width(300).ReadOnly();
-					columns.Bound(x => x.Rate).Width(100);
+					columns.Bound(x => x.ShippingMethodName).Width(500).ReadOnly();
+					columns.Bound(x => x.Rate).Width(180);
 					columns.Command(commands =>
 					{
 						commands.Edit();
-					}).Width(100);
+					});
 
 				})
 				.Editable(x =>

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ public partial class RouteProvider : IRouteProvider`
`8`	`8`	`{`
`9`	`9`	`public void RegisterRoutes(RouteCollection routes)`
`10`	`10`	`{`
`11`		`- routes.MapRoute("Plugin.Shipping.FixedRate.Configure",`
`12`		`- "Plugins/ShippingFixedRate/Configure",`
`13`		`- new { controller = "ShippingFixedRate", action = "Configure" },`
	`11`	`+ routes.MapRoute("Plugin.Shipping.FixedRate.Action",`
	`12`	`+ "Plugins/ShippingFixedRate/{action}",`
	`13`	`+ new { controller = "ShippingFixedRate" },`
`14`	`14`	`new[] { "SmartStore.Plugin.Shipping.FixedRate.Controllers" }`
`15`	`15`	`)`
`16`	`16`	`.DataTokens["area"] = "Shipping.FixedRate";`