From fa3266ecb2dc3bddce6875b1d67ed82f96c89003 Mon Sep 17 00:00:00 2001
From: KrzysztofPajak <krzysiek@grandnode.com>
Date: Tue, 2 Nov 2021 20:42:46 +0100
Subject: [PATCH] Admin panel - Add missing settings Show captcha on vendor
 review page

---
 .../GeneralCommon.TabSecuritySettings.cshtml       | 14 ++++++++++++++
 .../Mapper/CaptchaSettingsProfile.cs               |  2 ++
 .../Models/Settings/GeneralCommonSettingsModel.cs  |  2 ++
 .../App_Data/Resources/DefaultLanguage.xml         |  3 +++
 4 files changed, 21 insertions(+)

diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabSecuritySettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabSecuritySettings.cshtml
index 9fdd2b208..70c5170e9 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabSecuritySettings.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabSecuritySettings.cshtml
@@ -23,6 +23,7 @@
             $('#ssCaptchaShowOnApplyVendorPagepnl').show();
             $('#ssReCaptchaPrivateKeypnl').show();
             $('#ssReCaptchaVersionpnl').show();
+            $('#ssCaptchaShowOnVendorReviewPagepnl').show();
         }
         else {
             $('#ssCaptchaShowOnLoginPagepnl').hide();
@@ -40,6 +41,7 @@
             $('#ssCaptchaShowOnApplyVendorPagepnl').hide();
             $('#ssReCaptchaPrivateKeypnl').hide();
             $('#ssReCaptchaVersionpnl').hide();
+            $('#ssCaptchaShowOnVendorReviewPagepnl').hide();
         }
     }
 </script>
@@ -220,6 +222,18 @@
                 <span asp-validation-for="SecuritySettings.CaptchaShowOnApplyVendorPage"></span>
             </div>
         </div>
+        <div class="form-group" id="ssCaptchaShowOnVendorReviewPagepnl">
+            <div class="col-8 col-md-4 col-sm-4 text-right">
+                <admin-label asp-for="SecuritySettings.CaptchaShowOnVendorReviewPage" class="control-label" />
+            </div>
+            <div class="col-4 col-md-8 col-sm-8">
+                <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
+                    <admin-input asp-for="SecuritySettings.CaptchaShowOnVendorReviewPage" />
+                    <div class="control__indicator"></div>
+                </label>
+                <span asp-validation-for="SecuritySettings.CaptchaShowOnVendorReviewPage"></span>
+            </div>
+        </div>
         <div class="form-group" id="ssReCaptchaVersionpnl">
             <div class="col-8 col-md-4 col-sm-4 text-right">
                 <admin-label asp-for="SecuritySettings.ReCaptchaVersion" class="control-label" />
diff --git a/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs b/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs
index aade96697..2384c47b5 100644
--- a/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/CaptchaSettingsProfile.cs
@@ -23,6 +23,7 @@ public CaptchaSettingsProfile()
                 .ForMember(dest => dest.CaptchaShowOnNewsCommentPage, mo => mo.MapFrom(p => p.ShowOnNewsCommentPage))
                 .ForMember(dest => dest.CaptchaShowOnProductReviewPage, mo => mo.MapFrom(p => p.ShowOnProductReviewPage))
                 .ForMember(dest => dest.CaptchaShowOnApplyVendorPage, mo => mo.MapFrom(p => p.ShowOnApplyVendorPage))
+                .ForMember(dest => dest.CaptchaShowOnVendorReviewPage, mo => mo.MapFrom(p => p.ShowOnVendorReviewPage))
                 .ForMember(dest => dest.ReCaptchaVersion, mo => mo.MapFrom(p => p.ReCaptchaVersion))
                 .ForMember(dest => dest.ReCaptchaPublicKey, mo => mo.MapFrom(p => p.ReCaptchaPublicKey))
                 .ForMember(dest => dest.ReCaptchaPrivateKey, mo => mo.MapFrom(p => p.ReCaptchaPrivateKey))
@@ -43,6 +44,7 @@ public CaptchaSettingsProfile()
                 .ForMember(dest => dest.ShowOnNewsCommentPage, mo => mo.MapFrom(p => p.CaptchaShowOnNewsCommentPage))
                 .ForMember(dest => dest.ShowOnProductReviewPage, mo => mo.MapFrom(p => p.CaptchaShowOnProductReviewPage))
                 .ForMember(dest => dest.ShowOnApplyVendorPage, mo => mo.MapFrom(p => p.CaptchaShowOnApplyVendorPage))
+                .ForMember(dest => dest.ShowOnVendorReviewPage, mo => mo.MapFrom(p => p.CaptchaShowOnVendorReviewPage))
                 .ForMember(dest => dest.ReCaptchaVersion, mo => mo.MapFrom(p => p.ReCaptchaVersion))
                 .ForMember(dest => dest.ReCaptchaPublicKey, mo => mo.MapFrom(p => p.ReCaptchaPublicKey))
                 .ForMember(dest => dest.ReCaptchaPrivateKey, mo => mo.MapFrom(p => p.ReCaptchaPrivateKey));
diff --git a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
index 861ab0a9b..b9634f9d1 100644
--- a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
@@ -263,6 +263,8 @@ public SecuritySettingsModel()
             [GrandResourceDisplayName("Admin.Settings.GeneralCommon.CaptchaShowOnApplyVendorPage")]
             public bool CaptchaShowOnApplyVendorPage { get; set; }
 
+            [GrandResourceDisplayName("Admin.Settings.GeneralCommon.CaptchaShowOnVendorReviewPage")]
+            public bool CaptchaShowOnVendorReviewPage { get; set; }
 
             [GrandResourceDisplayName("Admin.Settings.GeneralCommon.reCaptchaPublicKey")]
 
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
index 533300ff0..1ebea76e2 100644
--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -11203,6 +11203,9 @@
   <Resource Name="Admin.Settings.GeneralCommon.CaptchaShowOnRegistrationPage">
     <Value>Show on registration page</Value>
   </Resource>
+  <Resource Name="Admin.Settings.GeneralCommon.CaptchaShowOnVendorReviewPage">
+    <Value>Show on vendor reviews page</Value>
+  </Resource>
   <Resource Name="Admin.Settings.GeneralCommon.ConvertNonWesternChars">
     <Value>Convert non-western chars</Value>
   </Resource>