diff --git a/Directory.Build.props b/Directory.Build.props
index 96a0461..46bd0f8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,11 +2,11 @@
- 3.404.0
+ 3.800.0
$(VersionSuffix)-$(BuildNumber)
true
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj
index 976f7e9..2aaa1da 100644
--- a/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj
+++ b/src/VirtoCommerce.ReturnModule.Core/VirtoCommerce.ReturnModule.Core.csproj
@@ -1,15 +1,14 @@
- net6.0
+ net8.0
false
-
-
-
+
+
+
-
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj
index da01abb..dd2117e 100644
--- a/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data.MySql/VirtoCommerce.ReturnModule.Data.MySql.csproj
@@ -1,18 +1,16 @@
-
- net6.0
+ net8.0
enable
enable
+ NU5104
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
-
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj b/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj
index 3ef0c2f..d7ea643 100644
--- a/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data.PostgreSql/VirtoCommerce.ReturnModule.Data.PostgreSql.csproj
@@ -1,19 +1,16 @@
-
- net6.0
+ net8.0
enable
enable
-
-
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
-
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj b/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj
index 454293c..1683a5e 100644
--- a/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data.SqlServer/VirtoCommerce.ReturnModule.Data.SqlServer.csproj
@@ -1,18 +1,15 @@
-
- net6.0
+ net8.0
enable
enable
-
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs b/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs
index 063205c..23d3f48 100644
--- a/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs
+++ b/src/VirtoCommerce.ReturnModule.Data/Repositories/ReturnDbContext.cs
@@ -2,10 +2,11 @@
using EntityFrameworkCore.Triggers;
using Microsoft.EntityFrameworkCore;
using VirtoCommerce.ReturnModule.Data.Models;
+using VirtoCommerce.Platform.Data.Infrastructure;
namespace VirtoCommerce.ReturnModule.Data.Repositories
{
- public class ReturnDbContext : DbContextWithTriggers
+ public class ReturnDbContext : DbContextBase
{
public ReturnDbContext(DbContextOptions options)
: base(options)
diff --git a/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs b/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs
index 44251d5..f938488 100644
--- a/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs
+++ b/src/VirtoCommerce.ReturnModule.Data/Services/ReturnService.cs
@@ -133,7 +133,7 @@ private async Task EnsureEachReturnHasNumber(IEnumerable returns)
if (ordersById.TryGetValue(orderReturn.OrderId, out var order) &&
storesById.TryGetValue(order.StoreId, out var store))
{
- numberTemplate = store.Settings.GetSettingValue(settingDescriptor.Name, numberTemplate);
+ numberTemplate = store.Settings.GetValue(settingDescriptor);
}
orderReturn.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate);
diff --git a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj
index e8002cf..0a955bc 100644
--- a/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj
+++ b/src/VirtoCommerce.ReturnModule.Data/VirtoCommerce.ReturnModule.Data.csproj
@@ -1,6 +1,6 @@
- net6.0
+ net8.0
@@ -10,12 +10,12 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj b/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj
index 6a0f4ca..7ffccd9 100644
--- a/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj
+++ b/src/VirtoCommerce.ReturnModule.Web/VirtoCommerce.ReturnModule.Web.csproj
@@ -1,6 +1,6 @@
- net6.0
+ net8.0
Library
@@ -14,4 +14,4 @@
-
+
\ No newline at end of file
diff --git a/src/VirtoCommerce.ReturnModule.Web/module.manifest b/src/VirtoCommerce.ReturnModule.Web/module.manifest
index 87be657..644c6ca 100644
--- a/src/VirtoCommerce.ReturnModule.Web/module.manifest
+++ b/src/VirtoCommerce.ReturnModule.Web/module.manifest
@@ -1,13 +1,15 @@
VirtoCommerce.Return
- 3.404.0
+ 3.800.0
- 3.400.0
+
+ 3.800.0
-
-
+
+
+
Return module
Return module
@@ -19,9 +21,9 @@
false
First version.
- Copyright © 2022–2023 VirtoCommerce. All rights reserved
+ Copyright © 2011-2024 Virto Commerce. All rights reserved
extension module
VirtoCommerce.ReturnModule.Web.dll
VirtoCommerce.ReturnModule.Web.Module, VirtoCommerce.ReturnModule.Web
false
-
\ No newline at end of file
+
diff --git a/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj b/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj
index 15023b3..f98ece4 100644
--- a/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj
+++ b/tests/VirtoCommerce.ReturnModule.Tests/VirtoCommerce.ReturnModule.Tests.csproj
@@ -1,6 +1,6 @@
- net6.0
+ net8.0
false
@@ -12,13 +12,13 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
+
+
+
-
+
\ No newline at end of file