Resolves #950 make contact form comply with current German law

Author: Michael-Herzog

changelog.md

@@ -19,6 +19,7 @@
 * #477 Implement option to specify the number of exported and imported pictures
 * #859 Make checkout attributes suitable for multi-stores
 * Product details: Select attribute and gift card values by query string parameters
+* #950 make contact form comply with current German law
 
 ### Improvements
 * Major improvements in Importer: better field mapping, higher performance, bug fixes etc.

src/Libraries/SmartStore.Core/Domain/Customers/CustomerSettings.cs

@@ -24,6 +24,7 @@ public CustomerSettings()
 			NewsletterEnabled = true;
 			OnlineCustomerMinutes = 20;
 			StoreLastVisitedPage = true;
+            DisplayPrivacyAgreementOnContactUs = false;
 		}
 
 		/// <summary>
@@ -151,6 +152,11 @@ public CustomerSettings()
         /// </summary>
         public bool StoreLastVisitedPage { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to display a checkbox to the customer where he can agree to privacy terms
+        /// </summary>
+        public bool DisplayPrivacyAgreementOnContactUs { get; set; }
+        
         #region Form fields
 
         /// <summary>

src/Libraries/SmartStore.Data/Migrations/201605201911421_ExportRevision.cs

@@ -174,6 +174,23 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
 				"This function is not available for guests.",
 				"Diese Funktion steht für Gäste nicht zur Verfügung.");
 
+            builder.AddOrUpdate("ContactUs.PrivacyAgreement",
+                "Privacy consent",
+                "Einwilligungserklärung Datenschutz");
+
+            builder.AddOrUpdate("ContactUs.PrivacyAgreement.MustBeAccepted",
+                "Please agree to the storage of your data.",
+                "Bitte stimmen Sie der Speicherung Ihrer Daten zu.");
+
+            builder.AddOrUpdate("ContactUs.PrivacyAgreement.DetailText",
+                "Yes I've read the <a href=\"{0}\">privacy terms</a> and agree that my data given by me can be stored electronically. My data will thereby only be used to process my inquiry.",
+                "Ja, ich habe die <a href=\"{0}\">Datenschutzerklärung</a> zur Kenntnis genommen und bin damit einverstanden, dass die von mir angegebenen Daten elektronisch erhoben und gespeichert werden. Meine Daten werden dabei nur zur Bearbeitung meiner Anfrage genutzt.");
+
+            builder.AddOrUpdate("Admin.Configuration.Settings.CustomerUser.DisplayPrivacyAgreementOnContactUs",
+                "Get privacy consent for contact requests",
+                "Einwilligungserklärung im Kontaktformular fordern",
+                "Specifies whether a checkbox will be displayed on the contact page which requests the user to agree on storage of his data.",
+                "Bestimmt ob im Kontaktformular eine Checkbox angezeigt wird, die den Benutzer auffordert der Speicherung seiner Daten zuzustimmen.");
 
 
 			builder.Delete(

src/Presentation/SmartStore.Web/Administration/Models/Settings/CustomerUserSettingsModel.cs

@@ -89,6 +89,9 @@ public partial class CustomerSettingsModel
             [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.StoreLastVisitedPage")]
             public bool StoreLastVisitedPage { get; set; }
 
+            [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.DisplayPrivacyAgreementOnContactUs")]
+            public bool DisplayPrivacyAgreementOnContactUs { get; set; }
+
             [SmartResourceDisplayName("Admin.Configuration.Settings.CustomerUser.GenderEnabled")]
             public bool GenderEnabled { get; set; }
 

src/Presentation/SmartStore.Web/Administration/Views/Setting/CustomerUser.cshtml

@@ -259,6 +259,15 @@
                 @Html.ValidationMessageFor(model => model.CustomerSettings.StoreLastVisitedPage)
             </td>
         </tr>
+        <tr>
+            <td class="adminTitle">
+                @Html.SmartLabelFor(model => model.CustomerSettings.DisplayPrivacyAgreementOnContactUs)
+            </td>
+            <td class="adminData">
+                @Html.SettingEditorFor(model => model.CustomerSettings.DisplayPrivacyAgreementOnContactUs)
+                @Html.ValidationMessageFor(model => model.CustomerSettings.DisplayPrivacyAgreementOnContactUs)
+            </td>
+        </tr>
     </table>
 }
 @helper TabCustomerFormFields()

src/Presentation/SmartStore.Web/Controllers/HomeController.cs

@@ -6,6 +6,7 @@
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Cms;
 using SmartStore.Core.Domain.Common;
+using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Messages;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Localization;
@@ -41,6 +42,7 @@ public partial class HomeController : PublicControllerBase
 		private readonly Lazy<ISitemapGenerator> _sitemapGenerator;
 		private readonly Lazy<CaptchaSettings> _captchaSettings;
 		private readonly Lazy<CommonSettings> _commonSettings;
+        private readonly Lazy<CustomerSettings> _customerSettings;
 
 		#endregion
 
@@ -56,7 +58,8 @@ public HomeController(
 			Lazy<IEmailAccountService> emailAccountService,
 			Lazy<ISitemapGenerator> sitemapGenerator,
 			Lazy<CaptchaSettings> captchaSettings,
-			Lazy<CommonSettings> commonSettings)
+			Lazy<CommonSettings> commonSettings,
+            Lazy<CustomerSettings> customerSettings)
         {
 			this._services = services;
 			this._categoryService = categoryService;
@@ -68,6 +71,7 @@ public HomeController(
 			this._sitemapGenerator = sitemapGenerator;
 			this._captchaSettings = captchaSettings;
 			this._commonSettings = commonSettings;
+            this._customerSettings = customerSettings;
         }
 
         #endregion
@@ -119,7 +123,9 @@ public ActionResult ContactUs()
 			{
 				Email = _services.WorkContext.CurrentCustomer.Email,
 				FullName = _services.WorkContext.CurrentCustomer.GetFullName(),
-				DisplayCaptcha = _captchaSettings.Value.Enabled && _captchaSettings.Value.ShowOnContactUsPage
+				DisplayCaptcha = _captchaSettings.Value.Enabled && _captchaSettings.Value.ShowOnContactUsPage,
+                DisplayPrivacyAgreement = _customerSettings.Value.DisplayPrivacyAgreementOnContactUs
+
 			};
 
 			return View(model);

src/Presentation/SmartStore.Web/Models/Common/ContactUsModel.cs

@@ -10,6 +10,11 @@ namespace SmartStore.Web.Models.Common
 	[Validator(typeof(ContactUsValidator))]
     public partial class ContactUsModel : ModelBase
     {
+        [SmartResourceDisplayName("ContactUs.PrivacyAgreement")]
+        public bool PrivacyAgreement { get; set; }
+
+        public bool DisplayPrivacyAgreement { get; set; }
+
         [AllowHtml]
         [SmartResourceDisplayName("ContactUs.Email")]
 		[DataType(DataType.EmailAddress)]

src/Presentation/SmartStore.Web/Validators/Common/ContactUsValidator.cs

@@ -8,6 +8,11 @@ public class ContactUsValidator : AbstractValidator<ContactUsModel>
     {
         public ContactUsValidator(ILocalizationService localizationService)
         {
+            RuleFor(x => x.PrivacyAgreement)
+                .Must(x => x == true)
+                .WithMessage(localizationService.GetResource("ContactUs.PrivacyAgreement.MustBeAccepted"))
+                .When(x => x.DisplayPrivacyAgreement == true);
+
             RuleFor(x => x.Email).NotEmpty().WithMessage(localizationService.GetResource("ContactUs.Email.Required"));
             RuleFor(x => x.Email).EmailAddress().WithMessage(localizationService.GetResource("Common.WrongEmail"));
             RuleFor(x => x.FullName).NotEmpty().WithMessage(localizationService.GetResource("ContactUs.FullName.Required"));

src/Presentation/SmartStore.Web/Views/Home/ContactUs.cshtml

@@ -24,11 +24,6 @@
             {
             <fieldset>
 
-                @if (!ViewData.ModelState.IsValid) 
-                {
-                    @Html.ValidationSummary(true)
-                }
-
                 <legend>@T("PageTitle.ContactUs")</legend>
 
                 <div class="control-group">
@@ -55,6 +50,28 @@
                     </div>
                 </div>
 
+                @if(Model.DisplayPrivacyAgreement)
+                { 
+                    @Html.HiddenFor(model => model.DisplayPrivacyAgreement)
+                    
+                    <div class="control-group">
+                        @Html.LabelFor(model => model.PrivacyAgreement, new { @class = "control-label required", @for = "PrivacyAgreement" })
+                        <div class="controls">
+                            <div>
+                                <label class="checkbox">
+                                    @Html.CheckBoxFor(model => model.PrivacyAgreement)
+                                    @Html.Raw(T("ContactUs.PrivacyAgreement.DetailText").Text.FormatWith(
+                                        Url.RouteUrl("Topic", new { SystemName = "PrivacyInfo" })
+                                    ))
+                                </label>
+                            </div>
+                            <div>
+                                @Html.ValidationMessageFor(model => model.PrivacyAgreement)
+                            </div>
+                        </div>
+                    </div>
+                }
+
                 @if (Model.DisplayCaptcha)
                 {
                     <div class="control-group">