Fixed conversion of LineItem.IsGift flag

VirtoCommerce · Apr 6, 2018 · 089dd35 · 089dd35
1 parent 8bed095
commit 089dd35
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/VirtoCommerce.OrderModule.Data/Model/LineItemEntity.cs b/VirtoCommerce.OrderModule.Data/Model/LineItemEntity.cs
@@ -94,8 +94,10 @@ public virtual LineItem ToModel(LineItem lineItem)
                 throw new ArgumentNullException(nameof(lineItem));
 
             lineItem.InjectFrom(this);
+            lineItem.IsGift = IsGift;
             lineItem.Discounts = Discounts.Select(x => x.ToModel(AbstractTypeFactory<Discount>.TryCreateInstance())).ToList();
             lineItem.TaxDetails = TaxDetails.Select(x => x.ToModel(AbstractTypeFactory<TaxDetail>.TryCreateInstance())).ToList();
+
             return lineItem;
         }
 
@@ -109,16 +111,20 @@ public virtual LineItemEntity FromModel(LineItem lineItem, PrimaryKeyResolvingMa
 
             this.InjectFrom(lineItem);
 
+            IsGift = lineItem.IsGift ?? false;
+
             if (lineItem.Discounts != null)
             {
                 Discounts = new ObservableCollection<DiscountEntity>();
                 Discounts.AddRange(lineItem.Discounts.Select(x => AbstractTypeFactory<DiscountEntity>.TryCreateInstance().FromModel(x)));
             }
+
             if (lineItem.TaxDetails != null)
             {
                 TaxDetails = new ObservableCollection<TaxDetailEntity>();
                 TaxDetails.AddRange(lineItem.TaxDetails.Select(x => AbstractTypeFactory<TaxDetailEntity>.TryCreateInstance().FromModel(x)));
             }
+
             return this;
         }