Merge branch 'dev' into feature/PT-13365-selected-for-checkout

VirtoCommerce · Sep 6, 2023 · 08e22cc · 08e22cc
2 parents 0e1be39 + bfceded
commit 08e22cc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.411.0</VersionPrefix>
+    <VersionPrefix>3.412.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.400.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.400.0" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.400.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.406.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.413.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.400.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.400.0" />
   </ItemGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Data/Repositories/OrderDbContext.cs b/src/VirtoCommerce.OrdersModule.Data/Repositories/OrderDbContext.cs
@@ -1,11 +1,11 @@
 using System.Reflection;
-using EntityFrameworkCore.Triggers;
 using Microsoft.EntityFrameworkCore;
 using VirtoCommerce.OrdersModule.Data.Model;
+using VirtoCommerce.Platform.Data.Infrastructure;
 
 namespace VirtoCommerce.OrdersModule.Data.Repositories
 {
-    public class OrderDbContext : DbContextWithTriggers
+    public class OrderDbContext : DbContextBase
     {
 #pragma warning disable S109
         private const int MaxLength = 128;

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs b/src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs
@@ -296,9 +296,7 @@ protected virtual Refund CreateRefund(PaymentIn payment, Store store, RefundOrde
         {
             var refund = AbstractTypeFactory<Refund>.TryCreateInstance();
 
-            var numberTemplate = store.Settings.GetSettingValue(
-                Core.ModuleConstants.Settings.General.RefundNewNumberTemplate.Name,
-                Core.ModuleConstants.Settings.General.RefundNewNumberTemplate.DefaultValue);
+            var numberTemplate = store.Settings.GetValue<string>(Core.ModuleConstants.Settings.General.RefundNewNumberTemplate);
             refund.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
 
             refund.Amount = request.Amount ?? payment.Sum;
@@ -320,9 +318,7 @@ protected virtual Capture CreateCapture(PaymentIn payment, Store store, CaptureO
         {
             var capture = AbstractTypeFactory<Capture>.TryCreateInstance();
 
-            var numberTemplate = store.Settings.GetSettingValue(
-                Core.ModuleConstants.Settings.General.CaptureNewNumberTemplate.Name,
-                Core.ModuleConstants.Settings.General.CaptureNewNumberTemplate.DefaultValue);
+            var numberTemplate = store.Settings.GetValue<string>(Core.ModuleConstants.Settings.General.CaptureNewNumberTemplate);
             capture.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
 
             capture.Amount = request.Amount ?? payment.Sum;

diff --git a/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj b/src/VirtoCommerce.OrdersModule.Data/VirtoCommerce.OrdersModule.Data.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.401.0" />
     <PackageReference Include="VirtoCommerce.InventoryModule.Core" Version="3.402.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.406.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.413.0" />
     <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.406.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Data" Version="3.402.0" />
   </ItemGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.411.0</version>
+  <version>3.412.0</version>
   <version-tag />
-  <platformVersion>3.406.0</platformVersion>
+  <platformVersion>3.413.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Cart" version="3.400.0" />
     <dependency id="VirtoCommerce.Catalog" version="3.401.0" />