Merge branch 'release/3.817.0'

VirtoCommerce · Jun 5, 2024 · a871d9d · a871d9d
2 parents a0251f4 + 7c7cd08
commit a871d9d
Show file tree

Hide file tree

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

diff --git a/src/VirtoCommerce.OrdersModule.Data/Model/CustomerOrderEntity.cs b/src/VirtoCommerce.OrdersModule.Data/Model/CustomerOrderEntity.cs
@@ -283,8 +283,13 @@ public override OperationEntity FromModel(OrderOperation operation, PrimaryKeyRe
 
             if (order.Discounts != null)
             {
-                Discounts = new ObservableCollection<DiscountEntity>(order.Discounts.Select(x =>
-                    AbstractTypeFactory<DiscountEntity>.TryCreateInstance().FromModel(x)));
+                Discounts = new ObservableCollection<DiscountEntity>();
+                foreach (var discount in order.Discounts)
+                {
+                    var discountEntity = AbstractTypeFactory<DiscountEntity>.TryCreateInstance().FromModel(discount);
+                    Discounts.Add(discountEntity);
+                    pkMap.AddPair(discount, discountEntity);
+                }
             }
 
             if (order.TaxDetails != null)

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderBuilder.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderBuilder.cs
@@ -383,6 +383,7 @@ protected virtual PaymentIn ToOrderModel(Payment payment)
 
             retVal.GatewayCode = payment.PaymentGatewayCode;
             retVal.Sum = payment.Amount;
+            retVal.Status = PaymentStatus.New.ToString();
             retVal.PaymentStatus = PaymentStatus.New;
             retVal.VendorId = payment.VendorId;
             retVal.Comment = payment.Comment;

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.816.0</version>
+  <version>3.817.0</version>
   <version-tag />
   <platformVersion>3.825.0</platformVersion>
   <dependencies>