Merge branch 'issue-3456-return-requests-when-order-completed' into develop

Author: exileDev

src/Libraries/Nop.Core/Domain/Orders/ReturnRequestSettings.cs

@@ -56,4 +56,9 @@ public partial class ReturnRequestSettings : ISettings
     /// Gets or sets a number of days for withdrawal link. Set to 0 if it doesn't expire.
     /// </summary>
     public int WithdrawalLinkDaysValid { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether return requests are available only for completed orders
+    /// </summary>
+    public bool ReturnRequestsForCompletedOrdersOnly { get; set; }
 }

src/Libraries/Nop.Services/Installation/InstallRequiredData.cs

@@ -1905,7 +1905,8 @@ protected virtual async Task InstallSettingsAsync()
             GuestReturnRequestsAllowed = false,
             ReturnReasonsEnabled = true,
             ReturnActionsEnabled = true,
-            WithdrawalLinkDaysValid = 7
+            WithdrawalLinkDaysValid = 7,
+            ReturnRequestsForCompletedOrdersOnly = true,
         });
 
         await SaveSettingAsync(dictionary, new SecuritySettings

src/Libraries/Nop.Services/Orders/OrderProcessingService.cs

@@ -3161,7 +3161,7 @@ public virtual async Task<bool> IsReturnRequestAllowedAsync(Order order)
             return false;
 
         //status should be complete
-        if (order.OrderStatus != OrderStatus.Complete)
+        if (_returnRequestSettings.ReturnRequestsForCompletedOrdersOnly && order.OrderStatus != OrderStatus.Complete)
             return false;
 
         //validate allowed number of days

src/Presentation/Nop.Web.Framework/Migrations/UpgradeTo500/LocalizationMigration.cs

@@ -825,6 +825,10 @@ public override void Up()
             //#8093
             ["Admin.Address.Fields.PhoneNumber.NotValid"] = "Phone number is not valid.",
             ["Admin.Customers.Customers.Fields.Phone.NotValid"] = "Phone number is not valid.",
+
+            //#3456
+            ["Admin.Configuration.Settings.Order.ReturnRequestsForCompletedOrdersOnly"] = "Allow return requests only for completed orders",
+            ["Admin.Configuration.Settings.Order.ReturnRequestsForCompletedOrdersOnly.Hint"] = "Check this option to allow return requests only for completed orders.",
         });
 
         #endregion

src/Presentation/Nop.Web.Framework/Migrations/UpgradeTo500/SettingMigration.cs

@@ -141,6 +141,9 @@ public override void Up()
             $"{nameof(CustomerSettings)}.PhoneNumberValidationUseRegex",
             $"{nameof(CustomerSettings)}.PhoneNumberValidationRule"
         ]);
+
+        //#3456
+        this.SetSettingIfNotExists<ReturnRequestSettings, bool>(settings => settings.ReturnRequestsForCompletedOrdersOnly, true);
     }
 
     public override void Down()

src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml

@@ -9122,6 +9122,12 @@
   <LocaleResource Name="Admin.Configuration.Settings.Order.ReturnRequestsEnabled.Hint">
     <Value>Check if you want to allow customers to submit return requests for items they've previously purchased.</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.Order.ReturnRequestsForCompletedOrdersOnly">
+    <Value>Allow return requests only for completed orders</Value>
+  </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Settings.Order.ReturnRequestsForCompletedOrdersOnly.Hint">
+    <Value>Check this option to allow return requests only for completed orders.</Value>
+  </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Settings.Order.ReturnRequestSettings">
     <Value>Return request (withdrawal button) settings</Value>
   </LocaleResource>

src/Presentation/Nop.Web/Areas/Admin/Controllers/SettingController.cs

@@ -997,6 +997,7 @@ public virtual async Task<IActionResult> Order(OrderSettingsModel model)
             await _settingService.SaveSettingOverridablePerStoreAsync(returnRequestSettings, x => x.WithdrawalLinkDaysValid, model.ReturnRequestSettings.WithdrawalLinkDaysValid_OverrideForStore, storeScope, false);
             await _settingService.SaveSettingOverridablePerStoreAsync(returnRequestSettings, x => x.ReturnReasonsEnabled, model.ReturnRequestSettings.ReturnReasonsEnabled_OverrideForStore, storeScope, false);
             await _settingService.SaveSettingOverridablePerStoreAsync(returnRequestSettings, x => x.ReturnActionsEnabled, model.ReturnRequestSettings.ReturnActionsEnabled_OverrideForStore, storeScope, false);
+            await _settingService.SaveSettingOverridablePerStoreAsync(returnRequestSettings, x => x.ReturnRequestsForCompletedOrdersOnly, model.ReturnRequestSettings.ReturnRequestsForCompletedOrdersOnly_OverrideForStore, storeScope, false);
 
             //now clear settings cache
             await _settingService.ClearCacheAsync();

src/Presentation/Nop.Web/Areas/Admin/Factories/SettingModelFactory.cs

@@ -1565,6 +1565,7 @@ public virtual async Task<ReturnRequestSettingsModel> PrepareReturnRequestSettin
         model.ReturnRequestsEnabled = returnRequestSettings.ReturnRequestsEnabled;
         model.UseEuWithdrawalLocales = returnRequestSettings.UseEuWithdrawalLocales;
         model.WithdrawalLinkDaysValid = returnRequestSettings.WithdrawalLinkDaysValid;
+        model.ReturnRequestsForCompletedOrdersOnly = returnRequestSettings.ReturnRequestsForCompletedOrdersOnly;
 
         //fill in additional values (not existing in the entity)
         model.ActiveStoreScopeConfiguration = storeId;
@@ -1581,6 +1582,7 @@ public virtual async Task<ReturnRequestSettingsModel> PrepareReturnRequestSettin
             model.GuestReturnRequestsAllowed_OverrideForStore = await _settingService.SettingExistsAsync(returnRequestSettings, x => x.GuestReturnRequestsAllowed, storeId);
             model.ReturnReasonsEnabled_OverrideForStore = await _settingService.SettingExistsAsync(returnRequestSettings, x => x.ReturnReasonsEnabled, storeId);
             model.ReturnActionsEnabled_OverrideForStore = await _settingService.SettingExistsAsync(returnRequestSettings, x => x.ReturnActionsEnabled, storeId);
+            model.ReturnRequestsForCompletedOrdersOnly_OverrideForStore = await _settingService.SettingExistsAsync(returnRequestSettings, x => x.ReturnRequestsForCompletedOrdersOnly, storeId);
         }
 
         //prepare nested search models

src/Presentation/Nop.Web/Areas/Admin/Infrastructure/Mapper/AdminMapperConfiguration.cs

@@ -1394,7 +1394,8 @@ protected virtual void CreateOrdersMaps()
             .ForMember(model => model.GuestReturnRequestsAllowed_OverrideForStore, options => options.Ignore())
             .ForMember(model => model.WithdrawalLinkDaysValid_OverrideForStore, options => options.Ignore())
             .ForMember(model => model.ReturnReasonsEnabled_OverrideForStore, options => options.Ignore())
-            .ForMember(model => model.ReturnActionsEnabled_OverrideForStore, options => options.Ignore());
+            .ForMember(model => model.ReturnActionsEnabled_OverrideForStore, options => options.Ignore())
+            .ForMember(model => model.ReturnRequestsForCompletedOrdersOnly_OverrideForStore, options => options.Ignore());
         CreateMap<ReturnRequestSettingsModel, ReturnRequestSettings>()
             .ForMember(settings => settings.ReturnRequestsFileMaximumSize, options => options.Ignore());
 

src/Presentation/Nop.Web/Areas/Admin/Models/Settings/ReturnRequestSettingsModel.cs

@@ -44,6 +44,10 @@ public partial record ReturnRequestSettingsModel : BaseNopModel, ISettingsModel
     public bool ReturnActionsEnabled { get; set; }
     public bool ReturnActionsEnabled_OverrideForStore { get; set; }
 
+    [NopResourceDisplayName("Admin.Configuration.Settings.Order.ReturnRequestsForCompletedOrdersOnly")]
+    public bool ReturnRequestsForCompletedOrdersOnly { get; set; }
+    public bool ReturnRequestsForCompletedOrdersOnly_OverrideForStore { get; set; }
+
     public ReturnRequestReasonSearchModel ReturnRequestReasonSearchModel { get; set; } = new();
     public ReturnRequestActionSearchModel ReturnRequestActionSearchModel { get; set; } = new();
 }