Merge remote-tracking branch 'remotes/origin/dev' into feat/VCST-1659

VirtoCommerce · Nov 19, 2024 · b55c1d1 · b55c1d1
2 parents 6a56a67 + b1027ec
commit b55c1d1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 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.813.0</VersionPrefix>
+    <VersionPrefix>3.815.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.XCart.Core/CartAggregate.cs b/src/VirtoCommerce.XCart.Core/CartAggregate.cs
@@ -806,6 +806,8 @@ public virtual async Task<CartAggregate> RecalculateAsync()
 
             await UpdateOrganizationName();
 
+            _cartTotalsCalculator.CalculateTotals(Cart);
+
             var promotionEvalResult = await EvaluatePromotionsAsync();
             await this.ApplyRewardsAsync(promotionEvalResult.Rewards);
 

diff --git a/src/VirtoCommerce.XCart.Core/Schemas/CartType.cs b/src/VirtoCommerce.XCart.Core/Schemas/CartType.cs
@@ -39,6 +39,7 @@ public CartType(
             Field(x => x.Cart.IsRecuring, nullable: true).Description("Displays whether the shopping cart is recurring");
             Field(x => x.Cart.Comment, nullable: true).Description("Shopping cart text comment");
             Field(x => x.Cart.PurchaseOrderNumber, nullable: true).Description("Purchase order number");
+            Field(x => x.Cart.CheckoutId, nullable: false).Description("Cart checkout ID");
 
             // Characteristics
             Field(x => x.Cart.VolumetricWeight, nullable: true).Description("Shopping cart volumetric weight value");

diff --git a/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj b/src/VirtoCommerce.XCart.Core/VirtoCommerce.XCart.Core.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.809.0" />
     <PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.813.0" />
-    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.816.0-alpha.705-vcst-1659" />
+    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.818.0" />
     <PackageReference Include="VirtoCommerce.PaymentModule.Core" Version="3.804.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.802.0" />
     <PackageReference Include="VirtoCommerce.InventoryModule.Core" Version="3.805.0" />

diff --git a/src/VirtoCommerce.XCart.Web/module.manifest b/src/VirtoCommerce.XCart.Web/module.manifest
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.XCart</id>
-  <version>3.813.0</version>
+  <version>3.815.0</version>
   <version-tag></version-tag>
 
   <platformVersion>3.861.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Cart" version="3.816.0" />
+    <dependency id="VirtoCommerce.Cart" version="3.818.0" />
     <dependency id="VirtoCommerce.Inventory" version="3.805.0" />
     <dependency id="VirtoCommerce.Marketing" version="3.812.0" />
     <dependency id="VirtoCommerce.Payment" version="3.804.0" />

diff --git a/tests/VirtoCommerce.XCart.Tests/Aggregates/CartAggregateTests.cs b/tests/VirtoCommerce.XCart.Tests/Aggregates/CartAggregateTests.cs
@@ -820,7 +820,7 @@ public async Task RecalculateAsync_HasPromoRewards_CalculateTotalsCalled()
             var result = await cartAggregate.RecalculateAsync();
 
             // Assert
-            _shoppingCartTotalsCalculatorMock.Verify(x => x.CalculateTotals(It.Is<ShoppingCart>(x => x == cartAggregate.Cart)), Times.Once);
+            _shoppingCartTotalsCalculatorMock.Verify(x => x.CalculateTotals(It.Is<ShoppingCart>(x => x == cartAggregate.Cart)), Times.Exactly(2));
         }
 
         #endregion RecalculateAsync