VCST-1562: update organization name on order create (#568)

Author: ksavosteev

src/XPurchase/VirtoCommerce.ExperienceApiModule.XOrder/Commands/CreateOrderFromCartCommandHandler.cs

@@ -46,16 +46,19 @@ public virtual async Task<CustomerOrderAggregate> Handle(CreateOrderFromCartComm
                 unselectedGifts.ForEach(x => cartAggregate.Cart.Items.Remove(x));
             }
 
+            cartAggregate.Cart.OrganizationName = null;
+            await cartAggregate.UpdateOrganizationName();
+
             await ValidateCart(cartAggregate);
 
-            // need to check for unsaved gift items before createing an order and resave the cart, otherwise an exception will be thrown on order create
+            // need to check for unsaved gift items before creating an order and resave the cart, otherwise an exception will be thrown on order create
             var hasUnsavedGifts = cartAggregate.GiftItems.Any(x => x.Id == null);
             if (hasUnsavedGifts)
             {
                 await _cartRepository.SaveAsync(cartAggregate);
             }
 
-            var result = await _customerOrderAggregateRepository.CreateOrderFromCart(cart);
+            var result = await _customerOrderAggregateRepository.CreateOrderFromCart(cartAggregate.Cart);
 
             // remove selected items after order create
             var selectedLineItemIds = cartAggregate.SelectedLineItems.Select(x => x.Id).ToArray();

src/XPurchase/VirtoCommerce.XPurchase/CartAggregate.cs

@@ -844,7 +844,7 @@ public virtual async Task<CartAggregate> UpdateOrganizationName()
             else if (string.IsNullOrEmpty(Cart.OrganizationName))
             {
                 var organization = await _memberService.GetByIdAsync(Cart.OrganizationId);
-                Cart.OrganizationName = organization.Name;
+                Cart.OrganizationName = organization?.Name;
             }
 
             return this;