Merge branch 'release/3.819.0'

VirtoCommerce · Jun 6, 2024 · f044983 · f044983
2 parents e5edb52 + 62b218d
commit f044983
Show file tree

Hide file tree

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

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderService.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderService.cs
@@ -143,7 +143,8 @@ public override async Task SaveChangesAsync(IList<CustomerOrder> models)
             // VP-5561: Need to fill changedEntries newEntry with the models built from saved entities (with the info filled when saving to database)
             foreach (var (changedEntry, i) in changedEntries.Select((x, i) => (x, i)))
             {
-                var changedModel = changedEntities[i].ToModel(AbstractTypeFactory<CustomerOrder>.TryCreateInstance());
+                // Here the original model from models parameter
+                var changedModel = changedEntities[i].ToModel(changedEntry.NewEntry);
 
                 // We need to CalculateTotals for the new Order, because it is empty after entity.ToModel creation
                 _totalsCalculator.CalculateTotals(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.818.0</version>
+  <version>3.819.0</version>
   <version-tag />
   <platformVersion>3.825.0</platformVersion>
   <dependencies>