Merge branch 'release/3.425.0'

VirtoCommerce · Dec 19, 2023 · 831e34c · 831e34c
2 parents 07fe19f + 0dc432e
commit 831e34c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 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.424.0</VersionPrefix>
+    <VersionPrefix>3.425.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderService.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderService.cs
@@ -85,6 +85,7 @@ public override async Task SaveChangesAsync(IList<CustomerOrder> models)
                         repository.PatchRowVersion(originalEntity, modifiedOrder.RowVersion);
 
                         var oldModel = originalEntity.ToModel(AbstractTypeFactory<CustomerOrder>.TryCreateInstance());
+                        await LoadOrderDependenciesAsync(oldModel);
                         _totalsCalculator.CalculateTotals(oldModel);
 
                         // Workaround to trigger update of auditable fields when only updating navigation properties.
@@ -147,6 +148,7 @@ public override async Task SaveChangesAsync(IList<CustomerOrder> models)
                 // We need to CalculateTotals for the new Order, because it is empty after entity.ToModel creation
                 _totalsCalculator.CalculateTotals(changedModel);
 
+                await LoadOrderDependenciesAsync(changedModel);
                 changedEntry.NewEntry = changedModel;
             }
 

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.424.0</version>
+  <version>3.425.0</version>
   <version-tag />
 
   <platformVersion>3.447.0</platformVersion>