GMC feed configuration validator was inactive

mgesing · mgesing · commit 2240bab7dbaa · 2014-12-08T17:00:50.000+01:00
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Localization/resources.de-de.xml b/src/Plugins/SmartStore.GoogleMerchantCenter/Localization/resources.de-de.xml
@@ -230,7 +230,7 @@
 		<Value>Nur online zu kaufen</Value>
 	</LocaleResource>
 	<LocaleResource Name="OnlineOnly.Hint">
-		<Value>Aktivieren Sie diese Option, wenn Produkte nur online erworben werden können. Aktivieren Sie diese Option nihct, falls Produkte auch in Ihrem Ladengeschäft erhältlich sind.</Value>
+		<Value>Aktivieren Sie diese Option, wenn Produkte nur online erworben werden können. Aktivieren Sie diese Option nicht, falls Produkte auch in Ihrem Ladengeschäft erhältlich sind.</Value>
 	</LocaleResource>
 	<LocaleResource Name="DescriptionToPlainText">
 		<Value>HTML entfernen</Value>
@@ -272,7 +272,7 @@
 		<Value>Anzahl der Tage, nach dem die Artikel verfallen bzw. nicht mehr angezeigt werden sollen. Der Wert 0 bewirkt, dass kein Verfallsdatum exportiert wird.</Value>
 	</LocaleResource>
 	<LocaleResource Name="ExpirationDays.Validate">
-		<Value>Der Wert muss zwischen 1 und 29 Tagen liegen.</Value>
+		<Value>Der Wert muss zwischen 0 und 29 Tagen liegen.</Value>
 	</LocaleResource>
 	<LocaleResource Name="ExportShipping">
 		<Value>Versanddaten exportieren</Value>
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Localization/resources.en-us.xml b/src/Plugins/SmartStore.GoogleMerchantCenter/Localization/resources.en-us.xml
@@ -272,7 +272,7 @@
 		<Value>Number of days after products should expire or no longer appear. A value of 0 causes that no expiry date will be exported.</Value>
 	</LocaleResource>
 	<LocaleResource Name="ExpirationDays.Validate">
-		<Value>The value must be between 1 and 29 days.</Value>
+		<Value>The value must be between 0 and 29 days.</Value>
 	</LocaleResource>
 	<LocaleResource Name="ExportShipping">
 		<Value>Export shipping data</Value>
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Models/FeedFroogleModel.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Models/FeedFroogleModel.cs
@@ -7,9 +7,12 @@
 using Newtonsoft.Json;
 using SmartStore.Web.Framework.Plugins;
 using SmartStore.Core.Domain.Catalog;
+using FluentValidation.Attributes;
+using SmartStore.GoogleMerchantCenter.Validators;
 
 namespace SmartStore.GoogleMerchantCenter.Models
 {
+	[Validator(typeof(ConfigurationValidator))]
 	public class FeedFroogleModel : PromotionFeedConfigModel
 	{
 		public string GridEditUrl { get; set; }
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Validators/ConfigurationValidator.cs b/src/Plugins/SmartStore.GoogleMerchantCenter/Validators/ConfigurationValidator.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using FluentValidation;
+﻿using FluentValidation;
 using SmartStore.GoogleMerchantCenter.Models;
 using SmartStore.Services.Localization;
 
@@ -13,7 +8,7 @@ public class ConfigurationValidator : AbstractValidator<FeedFroogleModel>
 	{
 		public ConfigurationValidator(ILocalizationService localize)
         {
-            RuleFor(x => x.ExpirationDays).InclusiveBetween(1, 29)
+            RuleFor(x => x.ExpirationDays).InclusiveBetween(0, 29)
 				.WithMessage(localize.GetResource("Plugins.Feed.Froogle.ExpirationDays.Validate"));
 		}
 	}
diff --git a/src/Plugins/SmartStore.GoogleMerchantCenter/Views/FeedFroogle/Configure.cshtml b/src/Plugins/SmartStore.GoogleMerchantCenter/Views/FeedFroogle/Configure.cshtml
@@ -37,7 +37,7 @@
     		$('#pnlGenerateStaticFileEachMinutes').toggle($('#@Html.FieldIdFor(m => m.TaskEnabled)').is(':checked'));
         }
     </script>
-		
+	
 	<form method="POST" action="@Url.Action("ConfigurePlugin", "Plugin", new { area = "Admin", systemName = Model.Helper.SystemName })" novalidate="novalidate">
     <table class="adminContent">
     <tr>

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,12 @@`
`7`	`7`	`using Newtonsoft.Json;`
`8`	`8`	`using SmartStore.Web.Framework.Plugins;`
`9`	`9`	`using SmartStore.Core.Domain.Catalog;`
	`10`	`+using FluentValidation.Attributes;`
	`11`	`+using SmartStore.GoogleMerchantCenter.Validators;`
`10`	`12`
`11`	`13`	`namespace SmartStore.GoogleMerchantCenter.Models`
`12`	`14`	`{`
	`15`	`+ [Validator(typeof(ConfigurationValidator))]`
`13`	`16`	`public class FeedFroogleModel : PromotionFeedConfigModel`
`14`	`17`	`{`
`15`	`18`	`public string GridEditUrl { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`		`-using FluentValidation;`
	`1`	`+using FluentValidation;`
`7`	`2`	`using SmartStore.GoogleMerchantCenter.Models;`
`8`	`3`	`using SmartStore.Services.Localization;`
`9`	`4`
`@@ -13,7 +8,7 @@ public class ConfigurationValidator : AbstractValidator<FeedFroogleModel>`
`13`	`8`	`{`
`14`	`9`	`public ConfigurationValidator(ILocalizationService localize)`
`15`	`10`	`{`
`16`		`- RuleFor(x => x.ExpirationDays).InclusiveBetween(1, 29)`
	`11`	`+ RuleFor(x => x.ExpirationDays).InclusiveBetween(0, 29)`
`17`	`12`	`.WithMessage(localize.GetResource("Plugins.Feed.Froogle.ExpirationDays.Validate"));`
`18`	`13`	`}`
`19`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`$('#pnlGenerateStaticFileEachMinutes').toggle($('#@Html.FieldIdFor(m => m.TaskEnabled)').is(':checked'));`
`38`	`38`	`}`
`39`	`39`	`</script>`
`40`		`-`
	`40`	`+`
`41`	`41`	`<form method="POST" action="@Url.Action("ConfigurePlugin", "Plugin", new { area = "Admin", systemName = Model.Helper.SystemName })" novalidate="novalidate">`
`42`	`42`	`<table class="adminContent">`
`43`	`43`	`<tr>`