Merge branch 'issue-8028-quote-details-page-timezone-inconsistency' into develop

Author: skoshelev

src/Plugins/Nop.Plugin.Misc.RFQ/Data/Migrations/AddLocales.cs

@@ -1,37 +1,20 @@
-using System.Globalization;
-using FluentMigrator;
+using FluentMigrator;
 using Nop.Data;
 using Nop.Data.Migrations;
-using Nop.Services.Common;
-using Nop.Services.Localization;
+using Nop.Web.Framework.Extensions;
 
 namespace Nop.Plugin.Misc.RFQ.Data.Migrations;
 
 [NopMigration("2025/11/01 19:41:53:1677556", "Misc.RFQ add the locale")]
 public class AddLocales : Migration
 {
-    private readonly ILanguageService _languageService;
-    private readonly ILocalizationService _localizationService;
-
-    public AddLocales(ILanguageService languageService,
-        ILocalizationService localizationService)
-    {
-        _languageService = languageService;
-        _localizationService = localizationService;
-    }
-
     /// <summary>Collect the UP migration expressions</summary>
     public override void Up()
     {
         if (!DataSettingsManager.IsDatabaseInstalled())
             return;
 
-        var languages = _languageService.GetAllLanguagesAsync(true).Result;
-        var languageId = languages
-            .Where(lang => lang.UniqueSeoCode == new CultureInfo(NopCommonDefaults.DefaultLanguageCulture).TwoLetterISOLanguageName)
-            .Select(lang => lang.Id).FirstOrDefault();
-
-        _localizationService.AddOrUpdateLocaleResourceAsync(new Dictionary<string, string>
+        this.AddOrUpdateLocaleResource(new Dictionary<string, string>
         {
             ["Plugins.Misc.RFQ.ShowCaptchaOnRequestPage"] = "Show CAPTCHA on request page",
             ["Plugins.Misc.RFQ.ShowCaptchaOnRequestPage.Hint"] = "Check to show CAPTCHA on request page, when send the new request a quote.",
@@ -43,7 +26,7 @@ public override void Up()
             ["Plugins.Misc.RFQ.AllowCustomerGenerateQuotePdf"] = "Quote PDF is allowed for the customer",
             ["Plugins.Misc.RFQ.AllowCustomerGenerateQuotePdf.Hint"] = "Check to allow the generation of the quote PDF for the customer",
             ["Plugins.Misc.RFQ.Fields.Quote.CustomerInfo"] = "Customer"
-        }, languageId).Wait();
+        });
     }
 
     /// <summary>

src/Plugins/Nop.Plugin.Misc.RFQ/Data/Migrations/UpdateDateTimeLocales.cs

@@ -0,0 +1,31 @@
+using FluentMigrator;
+using Nop.Data;
+using Nop.Data.Migrations;
+using Nop.Web.Framework.Extensions;
+
+namespace Nop.Plugin.Misc.RFQ.Data.Migrations;
+
+[NopMigration("2026/01/13 18:41:53:1677556", "Misc.RFQ add the locale")]
+public class UpdateDateTimeLocales : Migration
+{
+    /// <summary>Collect the UP migration expressions</summary>
+    public override void Up()
+    {
+        if (!DataSettingsManager.IsDatabaseInstalled())
+            return;
+
+        this.AddOrUpdateLocaleResource(new Dictionary<string, string>
+        {
+            ["Plugins.Misc.RFQ.Fields.Quote.CreatedOn.Hint"] = "The date/time (in the current customer time zone) that the quote was created.",
+            ["Plugins.Misc.RFQ.Fields.RequestQuote.CreatedOn.Hint"] = "The date/time (in the current customer time zone) that the request a quote was created.",
+        });
+    }
+
+    /// <summary>
+    /// Collects the DOWN migration expressions
+    /// </summary>
+    public override void Down()
+    {
+        //nothing
+    }
+}

src/Plugins/Nop.Plugin.Misc.RFQ/RfqPlugin.cs

@@ -169,9 +169,9 @@ await _localizationService.AddOrUpdateLocaleResourceAsync(new Dictionary<string,
             ["Plugins.Misc.RFQ.CustomerRequest.Info"] = "Request info",
             ["Plugins.Misc.RFQ.CustomerQuote.Info"] = "Quote info",
             ["Plugins.Misc.RFQ.Fields.Quote.CreatedOn"] = "Created on",
-            ["Plugins.Misc.RFQ.Fields.Quote.CreatedOn.Hint"] = "The date/time that the quote was created.",
+            ["Plugins.Misc.RFQ.Fields.Quote.CreatedOn.Hint"] = "The date/time (in the current customer time zone) that the quote was created.",
             ["Plugins.Misc.RFQ.Fields.RequestQuote.CreatedOn"] = "Created on",
-            ["Plugins.Misc.RFQ.Fields.RequestQuote.CreatedOn.Hint"] = "The date/time that the request a quote was created.",
+            ["Plugins.Misc.RFQ.Fields.RequestQuote.CreatedOn.Hint"] = "The date/time (in the current customer time zone) that the request a quote was created.",
             ["Plugins.Misc.RFQ.Fields.Quote.Status"] = "Status",
             ["Plugins.Misc.RFQ.Fields.Quote.Status.Hint"] = "The status of the quote",
             ["Plugins.Misc.RFQ.Fields.RequestQuote.Status"] = "Status",

src/Plugins/Nop.Plugin.Misc.RFQ/Services/RfqService.cs

@@ -172,7 +172,7 @@ private void LogNote(IAdminNote noteItem, string note)
         if (string.IsNullOrEmpty(note))
             return;
 
-        note = DateTime.UtcNow.ToString(RfqDefaults.DateTimeStringFormat) + $": {note}";
+        note = DateTime.UtcNow.ToString(RfqDefaults.DateTimeStringFormat) + $"(UTC): {note}";
 
         if (!string.IsNullOrEmpty(noteItem.AdminNotes))
             note += "\r\n";

src/Plugins/Nop.Plugin.Misc.RFQ/plugin.json

@@ -2,7 +2,7 @@
   "Group": "Misc",
   "FriendlyName": "\"Request for quote\" and \"Quotes\"",
   "SystemName": "Misc.RFQ",
-  "Version": "5.00.7",
+  "Version": "5.00.8",
   "SupportedVersions": ["5.00"],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,