Add Pinterest page URL to General Settings #348

grandnode · Sep 24, 2018 · aaca766 · aaca766
1 parent 968bbd4
commit aaca766
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 9 deletions.
diff --git a/Grand.Core/Domain/StoreInformationSettings.cs b/Grand.Core/Domain/StoreInformationSettings.cs
@@ -66,5 +66,10 @@ public class StoreInformationSettings : ISettings
         /// Gets or sets a value of LinkedIn page URL of the site
         /// </summary>
         public string LinkedInLink { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value of Pinterest page URL of the site
+        /// </summary>
+        public string PinterestLink { get; set; }
     }
 }
diff --git a/Grand.Services/Installation/CodeFirstInstallationService.cs b/Grand.Services/Installation/CodeFirstInstallationService.cs
@@ -5266,6 +5266,7 @@ protected virtual void InstallSettings(bool installSampleData)
                 GooglePlusLink = "https://plus.google.com/104905799281078572776",
                 InstagramLink = "https://www.instagram.com/grandnode/",
                 LinkedInLink = "https://www.linkedin.com/company/grandnode.com/",
+                PinterestLink = "",
                 HidePoweredByGrandNode = false
             });
 

diff --git a/Grand.Services/Messages/MessageTokenProvider.cs b/Grand.Services/Messages/MessageTokenProvider.cs
@@ -762,7 +762,7 @@ public virtual void AddStoreTokens(IList<Token> tokens, Store store, EmailAccoun
             tokens.Add(new Token("GooglePlus.URL", _storeInformationSettings.GooglePlusLink));
             tokens.Add(new Token("Instagram.URL", _storeInformationSettings.InstagramLink));
             tokens.Add(new Token("LinkedIn.URL", _storeInformationSettings.LinkedInLink));
-
+            tokens.Add(new Token("Pinterest.URL", _storeInformationSettings.PinterestLink));
             //event notification
             _eventPublisher.EntityTokensAdded(store, tokens);
         }
@@ -1293,6 +1293,7 @@ public virtual string[] GetListOfAllowedTokens()
                 "%GooglePlus.URL%",
                 "%Instagram.URL%",
                 "%LinkedIn.URL%",
+                "%Pinterest.URL%",
                 "%Order.OrderNumber%",
                 "%Order.CustomerFullName%",
                 "%Order.CustomerEmail%",
@@ -1434,8 +1435,8 @@ public virtual string[] GetListOfCustomerReminderAllowedTokens(CustomerReminderR
                 "%YouTube.URL%",
                 "%GooglePlus.URL%",
                 "%Instagram.URL%",
-                "%LinkedIn.URL%"}
-                );
+                "%LinkedIn.URL%",
+                "%Pinterest.URL%"});
 
             if (rule == CustomerReminderRuleEnum.AbandonedCart)
             {

diff --git a/Grand.Web/App_Data/Localization/Upgrade/EN_420_430.nopres.xml b/Grand.Web/App_Data/Localization/Upgrade/EN_420_430.nopres.xml
@@ -344,6 +344,12 @@
   <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.LinkedInLink.Hint">
     <Value>Specify your LinkedIn page URL. Leave empty if you have no such page.</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.PinterestLink">
+    <Value>Pinterest page URL</Value>
+  </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.PinterestLink.Hint">
+    <Value>Specify your Pinterest page URL. Leave empty if you have no such page.</Value>
+  </LocaleResource>
   <LocaleResource Name="search.noresultstextblog">
     <Value>No blog posts were found that matched your criteria.</Value>
   </LocaleResource>

diff --git a/Grand.Web/App_Data/Localization/defaultResources.grandres.xml b/Grand.Web/App_Data/Localization/defaultResources.grandres.xml
@@ -7113,6 +7113,12 @@
   <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.PdfSettings">
     <Value>PDF settings</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.PinterestLink">
+    <Value>Pinterest page URL</Value>
+  </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.PinterestLink.Hint">
+    <Value>Specify your Pinterest page URL. Leave empty if you have no such page.</Value>
+  </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.reCaptchaPrivateKey">
     <Value>reCAPTCHA private key</Value>
   </LocaleResource>

diff --git a/Grand.Web/Areas/Admin/Controllers/SettingController.cs b/Grand.Web/Areas/Admin/Controllers/SettingController.cs
@@ -2610,6 +2610,8 @@ public IActionResult GeneralCommon()
             model.StoreInformationSettings.GooglePlusLink = storeInformationSettings.GooglePlusLink;
             model.StoreInformationSettings.InstagramLink = storeInformationSettings.InstagramLink;
             model.StoreInformationSettings.LinkedInLink = storeInformationSettings.LinkedInLink;
+            model.StoreInformationSettings.PinterestLink = storeInformationSettings.PinterestLink;
+
             //contact us
             model.StoreInformationSettings.StoreInDatabaseContactUsForm = commonSettings.StoreInDatabaseContactUsForm;
             model.StoreInformationSettings.SubjectFieldOnContactUsForm = commonSettings.SubjectFieldOnContactUsForm;
@@ -2628,6 +2630,7 @@ public IActionResult GeneralCommon()
                 model.StoreInformationSettings.GooglePlusLink_OverrideForStore = _settingService.SettingExists(storeInformationSettings, x => x.GooglePlusLink, storeScope);
                 model.StoreInformationSettings.InstagramLink_OverrideForStore = _settingService.SettingExists(storeInformationSettings, x => x.InstagramLink, storeScope);
                 model.StoreInformationSettings.LinkedInLink_OverrideForStore = _settingService.SettingExists(storeInformationSettings, x => x.LinkedInLink, storeScope);
+                model.StoreInformationSettings.PinterestLink_OverrideForStore = _settingService.SettingExists(storeInformationSettings, x => x.PinterestLink, storeScope);
                 model.StoreInformationSettings.StoreInDatabaseContactUsForm_OverrideForStore = _settingService.SettingExists(commonSettings, x => x.StoreInDatabaseContactUsForm, storeScope);
                 model.StoreInformationSettings.SubjectFieldOnContactUsForm_OverrideForStore = _settingService.SettingExists(commonSettings, x => x.SubjectFieldOnContactUsForm, storeScope);
                 model.StoreInformationSettings.UseSystemEmailForContactUsForm_OverrideForStore = _settingService.SettingExists(commonSettings, x => x.UseSystemEmailForContactUsForm, storeScope);
@@ -2800,6 +2803,8 @@ public IActionResult GeneralCommon(GeneralCommonSettingsModel model)
             storeInformationSettings.GooglePlusLink = model.StoreInformationSettings.GooglePlusLink;
             storeInformationSettings.InstagramLink = model.StoreInformationSettings.InstagramLink;
             storeInformationSettings.LinkedInLink = model.StoreInformationSettings.LinkedInLink;
+            storeInformationSettings.PinterestLink = model.StoreInformationSettings.PinterestLink;
+
             //contact us
             commonSettings.StoreInDatabaseContactUsForm = model.StoreInformationSettings.StoreInDatabaseContactUsForm;
             commonSettings.SubjectFieldOnContactUsForm = model.StoreInformationSettings.SubjectFieldOnContactUsForm;
@@ -2864,6 +2869,11 @@ public IActionResult GeneralCommon(GeneralCommonSettingsModel model)
             else if (!String.IsNullOrEmpty(storeScope))
                 _settingService.DeleteSetting(storeInformationSettings, x => x.LinkedInLink, storeScope);
 
+            if (model.StoreInformationSettings.PinterestLink_OverrideForStore || storeScope == "")
+                _settingService.SaveSetting(storeInformationSettings, x => x.PinterestLink, storeScope, false);
+            else if (!String.IsNullOrEmpty(storeScope))
+                _settingService.DeleteSetting(storeInformationSettings, x => x.PinterestLink, storeScope);
+
             if (model.StoreInformationSettings.StoreInDatabaseContactUsForm_OverrideForStore || storeScope == "")
                 _settingService.SaveSetting(commonSettings, x => x.StoreInDatabaseContactUsForm, storeScope, false);
             else if (!String.IsNullOrEmpty(storeScope))

diff --git a/Grand.Web/Areas/Admin/Models/Settings/GeneralCommonSettingsModel.cs b/Grand.Web/Areas/Admin/Models/Settings/GeneralCommonSettingsModel.cs
@@ -94,6 +94,10 @@ public StoreInformationSettingsModel()
             public string LinkedInLink { get; set; }
             public bool LinkedInLink_OverrideForStore { get; set; }
 
+            [GrandResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.PinterestLink")]
+            public string PinterestLink { get; set; }
+            public bool PinterestLink_OverrideForStore { get; set; }
+
             [GrandResourceDisplayName("Admin.Configuration.Settings.GeneralCommon.StoreInDatabaseContactUsForm")]
             public bool StoreInDatabaseContactUsForm { get; set; }
             public bool StoreInDatabaseContactUsForm_OverrideForStore { get; set; }

diff --git a/Grand.Web/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml b/Grand.Web/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml
@@ -159,6 +159,16 @@
                 <span asp-validation-for="StoreInformationSettings.LinkedInLink"></span>
             </div>
         </div>
+        <div class="form-group">
+            <div class="col-md-4 col-sm-4 text-right">
+                @Html.OverrideStoreCheckboxFor(model => model.StoreInformationSettings.PinterestLink_OverrideForStore, model => model.StoreInformationSettings.PinterestLink, Model.ActiveStoreScopeConfiguration)
+                <admin-label asp-for="StoreInformationSettings.PinterestLink" class="control-label" />
+            </div>
+            <div class="col-md-8 col-sm-8">
+                <admin-input asp-for="StoreInformationSettings.PinterestLink" />
+                <span asp-validation-for="StoreInformationSettings.PinterestLink"></span>
+            </div>
+        </div>
         <div class="form-group">
             <div class="col-md-4 col-sm-4 text-right">
                 @Html.OverrideStoreCheckboxFor(model => model.StoreInformationSettings.StoreInDatabaseContactUsForm_OverrideForStore, model => model.StoreInformationSettings.StoreInDatabaseContactUsForm, Model.ActiveStoreScopeConfiguration)

diff --git a/Grand.Web/Models/Common/FooterModel.cs b/Grand.Web/Models/Common/FooterModel.cs
@@ -18,6 +18,7 @@ public FooterModel()
         public string GooglePlusLink { get; set; }
         public string InstagramLink { get; set; }
         public string LinkedInLink { get; set; }
+        public string PinterestLink { get; set; }
         public bool WishlistEnabled { get; set; }
         public bool ShoppingCartEnabled { get; set; }
         public bool SitemapEnabled { get; set; }

diff --git a/Grand.Web/Services/CommonWebService.cs b/Grand.Web/Services/CommonWebService.cs
@@ -406,6 +406,7 @@ public virtual FooterModel PrepareFooter()
                 GooglePlusLink = _storeInformationSettings.GooglePlusLink,
                 InstagramLink = _storeInformationSettings.InstagramLink,
                 LinkedInLink = _storeInformationSettings.LinkedInLink,
+                PinterestLink = _storeInformationSettings.PinterestLink,
                 BlogEnabled = _blogSettings.Enabled,
                 KnowledgebaseEnabled = _knowledgebaseSettings.Enabled,
                 CompareProductsEnabled = _catalogSettings.CompareProductsEnabled,

diff --git a/Grand.Web/Views/Shared/Components/Footer/Default.cshtml b/Grand.Web/Views/Shared/Components/Footer/Default.cshtml
@@ -12,7 +12,7 @@
                         @if (!string.IsNullOrEmpty(Model.FacebookLink))
                         {
                             <li class="list-group-item facebook">
-                                <a title="facebook" href="@Model.FacebookLink" target="facebook">
+                                <a title="facebook" href="@Model.FacebookLink" target="_blank">
                                     <span class="sr-only">Facebook</span>
                                     <span class="fab fa-facebook-square fa-2x"></span>
                                 </a>
@@ -21,7 +21,7 @@
                         @if (!string.IsNullOrEmpty(Model.TwitterLink))
                         {
                             <li class="list-group-item twitter">
-                                <a href="@Model.TwitterLink" target="twitter">
+                                <a href="@Model.TwitterLink" target="_blank">
                                     <span class="fab fa-twitter fa-2x"></span>
                                     <span class="sr-only">twitter</span>
                                 </a>
@@ -39,7 +39,7 @@
                         @if (!string.IsNullOrEmpty(Model.YoutubeLink))
                         {
                             <li class="list-group-item youtube">
-                                <a href="@Model.YoutubeLink" target="youtube">
+                                <a href="@Model.YoutubeLink" target="_blank">
                                     <span class="fab fa-youtube fa-2x"></span>
                                     <span class="sr-only">youtube</span>
                                 </a>
@@ -48,19 +48,25 @@
                         @if (!string.IsNullOrEmpty(Model.GooglePlusLink))
                         {
                             <li class="list-group-item google-plus">
-                                <a href="@Model.GooglePlusLink" target="google-plus"><span class="fab fa-google-plus fa-2x"></span><span class="sr-only">google plus</span></a>
+                                <a href="@Model.GooglePlusLink" target="_blank"><span class="fab fa-google-plus fa-2x"></span><span class="sr-only">google plus</span></a>
                             </li>
                         }
                         @if (!string.IsNullOrEmpty(Model.InstagramLink))
                         {
                             <li class="list-group-item instagram">
-                                <a href="@Model.InstagramLink" target="instagram"><span class="fab fa-instagram fa-2x"></span><span class="sr-only">instagram</span></a>
+                                <a href="@Model.InstagramLink" target="_blank"><span class="fab fa-instagram fa-2x"></span><span class="sr-only">instagram</span></a>
                             </li>
                         }
                         @if (!string.IsNullOrEmpty(Model.LinkedInLink))
                         {
                             <li class="list-group-item linkedin">
-                                <a href="@Model.LinkedInLink" target="linkedin"><span class="fab fa-linkedin fa-2x"></span><span class="sr-only">linkedin</span></a>
+                                <a href="@Model.LinkedInLink" target="_blank"><span class="fab fa-linkedin fa-2x"></span><span class="sr-only">linkedin</span></a>
+                            </li>
+                        }
+                        @if (!string.IsNullOrEmpty(Model.PinterestLink))
+                        {
+                            <li class="list-group-item pinterest">
+                                <a href="@Model.PinterestLink" target="_blank"><span class="fab fa-pinterest fa-2x"></span><span class="sr-only">pinterest</span></a>
                             </li>
                         }
                     </ol>