Merge branch 'release/3.836.0'

VirtoCommerce · Nov 25, 2024 · e0f8b35 · e0f8b35
2 parents 03024b5 + 103cfca
commit e0f8b35
Show file tree

Hide file tree

Showing 25 changed files with 6,985 additions and 22 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.835.0</VersionPrefix>
+    <VersionPrefix>3.836.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj b/samples/VirtoCommerce.OrdersModule2.Web/VirtoCommerce.OrdersModule2.Web.csproj
@@ -5,11 +5,11 @@
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.861.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.867.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.OrdersModule.Core\VirtoCommerce.OrdersModule.Core.csproj" />

diff --git a/src/VirtoCommerce.OrdersModule.Core/Model/ConfigurationItem.cs b/src/VirtoCommerce.OrdersModule.Core/Model/ConfigurationItem.cs
@@ -0,0 +1,29 @@
+using VirtoCommerce.Platform.Core.Common;
+using VirtoCommerce.Platform.Core.Swagger;
+
+namespace VirtoCommerce.OrdersModule.Core.Model;
+
+[SwaggerSchemaId("OrderConfigurationItem")]
+public class ConfigurationItem : AuditableEntity
+{
+    public string LineItemId { get; set; }
+
+    public string ProductId { get; set; }
+
+    public string Name { get; set; }
+
+    public string Sku { get; set; }
+
+    public int Quantity { get; set; }
+
+    public string ImageUrl { get; set; }
+
+    public string CatalogId { get; set; }
+
+    public string CategoryId { get; set; }
+
+    public object Clone()
+    {
+        return MemberwiseClone();
+    }
+}
diff --git a/src/VirtoCommerce.OrdersModule.Core/Model/LineItem.cs b/src/VirtoCommerce.OrdersModule.Core/Model/LineItem.cs
@@ -97,6 +97,8 @@ public class LineItem : AuditableEntity, IHasTaxDetalization, ISupportCancellati
 
         public string VendorId { get; set; }
 
+        public bool IsConfigured { get; set; }
+
         #region IHaveDimension Members
 
         public string WeightUnit { get; set; }
@@ -135,6 +137,12 @@ public class LineItem : AuditableEntity, IHasTaxDetalization, ISupportCancellati
 
         #endregion
 
+        #region Configuration Items
+
+        public ICollection<ConfigurationItem> ConfigurationItems { get; set; }
+
+        #endregion
+
         public virtual void ReduceDetails(string responseGroup)
         {
             var orderResponseGroup = EnumUtility.SafeParseFlags(responseGroup, CustomerOrderResponseGroup.Full);

diff --git a/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj b/src/VirtoCommerce.OrdersModule.Core/VirtoCommerce.OrdersModule.Core.csproj
@@ -15,12 +15,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.818.0" />
-    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.812.0" />
+    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.820.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" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.804.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.861.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.867.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.802.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.809.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />