Merge branch 'release/3.413.0'

VirtoCommerce · Sep 14, 2023 · 9aea930 · 9aea930
2 parents 6780f74 + f538201
commit 9aea930
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 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.412.0</VersionPrefix>
+    <VersionPrefix>3.413.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

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="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.400.0" />
+    <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.403.0" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.400.0" />
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.400.0" />
     <PackageReference Include="VirtoCommerce.NotificationsModule.Core" Version="3.400.0" />

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderBuilder.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderBuilder.cs
@@ -55,7 +55,7 @@ protected virtual CustomerOrder ConvertCartToOrder(ShoppingCart cart)
             // Copy LineItems
             if (cart.Items != null)
             {
-                order.Items = ToOrderModel(cart.Items, cartLineItemsMap);
+                order.Items = ToOrderModel(cart.Items.Where(x => x.SelectedForCheckout).ToList(), cartLineItemsMap);
             }
 
             // Copy Discounts

diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderService.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderService.cs
@@ -235,7 +235,12 @@ protected virtual async Task EnsureThatAllOperationsHaveNumber(CustomerOrder ord
                     var numberTemplate = opType + "{0:yyMMdd}-{1:D5}";
                     if (store != null)
                     {
-                        numberTemplate = store.Settings.GetSettingValue("Order." + objectTypeName + "NewNumberTemplate", numberTemplate);
+                        var descriptor = new SettingDescriptor
+                        {
+                            Name = "Order." + objectTypeName + "NewNumberTemplate",
+                            DefaultValue = numberTemplate,
+                        };
+                        numberTemplate = store.Settings.GetValue<string>(descriptor);
                     }
 
                     operation.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate);

diff --git a/src/VirtoCommerce.OrdersModule.Web/Controllers/Api/OrderModuleController.cs b/src/VirtoCommerce.OrdersModule.Web/Controllers/Api/OrderModuleController.cs
@@ -414,9 +414,7 @@ public async Task<ActionResult<Shipment>> GetNewShipment(string id)
                 retVal.Status = "New";
 
                 var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
-                var numberTemplate = store.Settings.GetSettingValue(
-                    ModuleConstants.Settings.General.OrderShipmentNewNumberTemplate.Name,
-                    ModuleConstants.Settings.General.OrderShipmentNewNumberTemplate.DefaultValue);
+                var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.OrderShipmentNewNumberTemplate);
                 retVal.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
 
                 return Ok(retVal);
@@ -453,9 +451,7 @@ public async Task<ActionResult<PaymentIn>> GetNewPayment(string id)
                 retVal.Status = retVal.PaymentStatus.ToString();
 
                 var store = await _storeService.GetNoCloneAsync(order.StoreId, StoreResponseGroup.StoreInfo.ToString());
-                var numberTemplate = store.Settings.GetSettingValue(
-                    ModuleConstants.Settings.General.OrderPaymentInNewNumberTemplate.Name,
-                    ModuleConstants.Settings.General.OrderPaymentInNewNumberTemplate.DefaultValue);
+                var numberTemplate = store.Settings.GetValue<string>(ModuleConstants.Settings.General.OrderPaymentInNewNumberTemplate);
                 retVal.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate.ToString());
                 return Ok(retVal);
             }

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.412.0</version>
+  <version>3.413.0</version>
   <version-tag />
   <platformVersion>3.413.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Cart" version="3.400.0" />
+    <dependency id="VirtoCommerce.Cart" version="3.403.0" />
     <dependency id="VirtoCommerce.Catalog" version="3.401.0" />
     <dependency id="VirtoCommerce.Core" version="3.400.0" />
     <dependency id="VirtoCommerce.Customer" version="3.400.0" />