merge from dev

VirtoCommerce · Dec 20, 2024 · b9afef9 · b9afef9
2 parents ee83b07 + c806ec4
commit b9afef9
Show file tree

Hide file tree

Showing 69 changed files with 26,486 additions and 142 deletions.
diff --git a/.github/workflows/module-ci.yml b/.github/workflows/module-ci.yml
@@ -1,5 +1,5 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Module CI
 
 on:
@@ -239,9 +239,9 @@ jobs:
 
   module-katalon-tests:
     if: ${{ ((github.ref == 'refs/heads/dev') && (github.event_name == 'push') && (needs.ci.outputs.run-e2e == 'true')) ||
-        (github.event_name == 'workflow_dispatch')}}
+        (github.event_name == 'workflow_dispatch') || (github.base_ref == 'dev') && (github.event_name == 'pull_request') }}
     needs: 'ci'
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
 
     with:
       katalonRepo: 'VirtoCommerce/vc-quality-gate-katalon'
@@ -260,7 +260,7 @@ jobs:
   deploy-cloud:
     if: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
     needs: ci
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
     with:
       releaseSource: module
       moduleId: ${{ needs.ci.outputs.moduleId }}

diff --git a/.github/workflows/module-release-hotfix.yml b/.github/workflows/module-release-hotfix.yml
@@ -1,5 +1,5 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Release hotfix
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -46,7 +46,7 @@ jobs:
   publish-github-release:
     needs:
       [build, test, get-metadata]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       changeLog: '${{ needs.get-metadata.outputs.changeLog }}'

diff --git a/.github/workflows/publish-nugets.yml b/.github/workflows/publish-nugets.yml
@@ -1,5 +1,5 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Publish nuget
 
 on:
@@ -13,12 +13,12 @@ on:
 
 jobs:
   test:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     secrets:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
 
   build:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     with:
       uploadPackage: 'true'
       uploadDocker: 'false'
@@ -29,7 +29,7 @@ jobs:
   publish-nuget:
     needs:
       [build, test]
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     with:
       fullKey: ${{ needs.build.outputs.packageFullKey }}
       forceGithub: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,12 +1,12 @@
-# v3.800.9
-# https://virtocommerce.atlassian.net/browse/VCST-1260
+# v3.800.10
+# https://virtocommerce.atlassian.net/browse/VCST-1738
 name: Release
 
 on:
   workflow_dispatch:
 
 jobs:
   release:
-    uses: VirtoCommerce/.github/.github/workflows/[email protected].9    
+    uses: VirtoCommerce/.github/.github/workflows/[email protected].10    
     secrets:
       envPAT: ${{ secrets.REPO_TOKEN }}
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.832.0</VersionPrefix>
+    <VersionPrefix>3.839.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.853.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
@@ -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; }
@@ -97,6 +107,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 +147,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/Model/Search/CustomerOrderSearchCriteria.cs b/src/VirtoCommerce.OrdersModule.Core/Model/Search/CustomerOrderSearchCriteria.cs
@@ -84,5 +84,10 @@ public string[] OrganizationIds
                 _organizationIds = value;
             }
         }
+
+        /// <summary>
+        /// Search orders with a certain product
+        /// </summary>
+        public string ProductId { get; set; }
     }
 }
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.813.0" />
-    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.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.809.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.853.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" />