Merge branch 'release/3.838.0'

VirtoCommerce · Dec 19, 2024 · 3c4ae03 · 3c4ae03
2 parents d5168a1 + 4ff67af
commit 3c4ae03
Show file tree

Hide file tree

Showing 17 changed files with 6,547 additions and 19 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.837.0</VersionPrefix>
+    <VersionPrefix>3.838.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.OrdersModule.Core/Model/LineItem.cs b/src/VirtoCommerce.OrdersModule.Core/Model/LineItem.cs
@@ -27,6 +27,9 @@ public class LineItem : AuditableEntity, IHasTaxDetalization, ISupportCancellati
 
         public virtual decimal PriceWithTax { get; set; }
 
+        public decimal ListTotal { get; set; }
+        public decimal ListTotalWithTax { get; set; }
+
         /// <summary>
         /// Resulting price with discount for one unit
         /// </summary>
@@ -43,6 +46,13 @@ public class LineItem : AuditableEntity, IHasTaxDetalization, ISupportCancellati
         /// </summary>
         public virtual decimal DiscountAmount { get; set; }
 
+        /// <summary>
+        /// Indicates whether the discount amount per item was rounded according to the currency settings.
+        /// If false, DiscountAmount and PlacedPrice should not be visible to the customer, as these values may be incorrect;
+        /// in this case, DiscountTotal and ExtendedPrice should be used.
+        /// </summary>
+        public bool IsDiscountAmountRounded { get; set; }
+
         public virtual decimal DiscountAmountWithTax { get; set; }
 
         public decimal DiscountTotal { get; set; }

diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.820.0" />
+    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.823.0" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.813.0" />
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.817.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.811.0" />