Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PT-14000: fix adding documents to subscription order #84

Merged
merged 1 commit into from
Oct 25, 2023
Merged

PT-14000: fix adding documents to subscription order #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions src/VirtoCommerce.SubscriptionModule.Data/Services/SubscriptionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,35 +113,11 @@ public virtual async Task SaveSubscriptionsAsync(Subscription[] subscriptions)
subscription.Number = _uniqueNumberGenerator.GenerateNumber(numberTemplate);
}

//Save subscription order prototype with same as subscription Number
if (subscription.CustomerOrderPrototype != null && (
subscription.CustomerOrderPrototype.Number != subscription.Number ||
!subscription.CustomerOrderPrototype.IsPrototype))
//Save subscription order prototype and reload it to refresh RowVersion
if (subscription.CustomerOrderPrototype != null)
{
var order = await _customerOrderService.GetByIdAsync(subscription.CustomerOrderPrototype.Id);
order.Number = subscription.Number;
order.IsPrototype = true;

await _customerOrderService.SaveChangesAsync(new[] { order });
}

if (subscription.CustomerOrders != null)
{
var modifiedOrders = new List<CustomerOrder>();

foreach (var order in subscription.CustomerOrders)
{
if (order.SubscriptionNumber != subscription.Number)
{
var modifiedOrder = await _customerOrderService.GetByIdAsync(order.Id);
modifiedOrders.Add(modifiedOrder);
}
}

if (modifiedOrders.Any())
{
await _customerOrderService.SaveChangesAsync(modifiedOrders);
}
await _customerOrderService.SaveChangesAsync(new[] { subscription.CustomerOrderPrototype });
subscription.CustomerOrderPrototype = await _customerOrderService.GetByIdAsync(subscription.CustomerOrderPrototype.Id);
}

var originalEntity = existEntities.FirstOrDefault(x => x.Id == subscription.Id);
Expand Down
Loading