fix: Check vendors from selected cart items for shipments and payments (

#387)
VirtoCommerce · Nov 13, 2023 · 1926ba8 · 1926ba8
1 parent 58ab379
commit 1926ba8
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderBuilder.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderBuilder.cs
@@ -48,14 +48,17 @@ public virtual async Task<CustomerOrder> PlaceCustomerOrderFromCartAsync(Shoppin
         protected virtual CustomerOrder ConvertCartToOrder(ShoppingCart cart)
         {
             var cartLineItemsMap = new Dictionary<string, LineItem>();
+            var vendorIds = new List<string>();
 
             // Copy Native Properties
             var order = ToOrderModel(cart);
 
             // Copy LineItems
             if (cart.Items != null)
             {
-                order.Items = ToOrderModel(cart.Items.Where(x => x.SelectedForCheckout).ToList(), cartLineItemsMap);
+                var cartLineItems = cart.Items.Where(x => x.SelectedForCheckout).ToArray();
+                order.Items = ToOrderModel(cartLineItems, cartLineItemsMap);
+                vendorIds.AddRange(cartLineItems.Select(x => x.VendorId).Where(x => !string.IsNullOrEmpty(x)).Distinct());
             }
 
             // Copy Discounts
@@ -67,13 +70,19 @@ protected virtual CustomerOrder ConvertCartToOrder(ShoppingCart cart)
             // Copy Shipments
             if (cart.Shipments != null)
             {
-                order.Shipments = ToOrderModel(cart.Shipments, cartLineItemsMap);
+                var cartShipments = vendorIds.Any()
+                    ? cart.Shipments.Where(x => string.IsNullOrEmpty(x.VendorId) || vendorIds.Contains(x.VendorId)).ToArray()
+                    : cart.Shipments;
+                order.Shipments = ToOrderModel(cartShipments, cartLineItemsMap);
             }
 
             // Copy Payments
             if (cart.Payments != null)
             {
-                order.InPayments = ToOrderModel(cart, cart.Payments);
+                var cartPayments = vendorIds.Any()
+                    ? cart.Payments.Where(x => string.IsNullOrEmpty(x.VendorId) || vendorIds.Contains(x.VendorId)).ToArray()
+                    : cart.Payments;
+                order.InPayments = ToOrderModel(cart, cartPayments);
             }
 
             // Copy DynamicProperties