Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-01 23:31:41 +01:00
Code Issues Projects Releases Wiki Activity

Restore original collection method (#804)

Browse Source
This commit is contained in:
Chad Scharf 2020-06-30 11:52:50 -04:00 committed by GitHub
parent d7b00f6c27
commit a37706eba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -336,6 +336,8 @@ namespace Bit.Core.Services
var prorationDate = DateTime.UtcNow;
var seatItem = sub.Items?.Data?.FirstOrDefault(i => i.Plan.Id == plan.StripeSeatPlanId);
// Retain original collection method
var collectionMethod = sub.CollectionMethod;
var subResponse = await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
{
@ -381,17 +383,20 @@ namespace Bit.Core.Services
// This proration behavior prevents a false "credit" from
// being applied forward to the next month's invoice
ProrationBehavior = "none",
CollectionMethod = "charge_automatically",
CollectionMethod = collectionMethod,
});
throw;
}
}
// Change back the subscription collection method
await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
if (collectionMethod != "send_invoice")
{
CollectionMethod = "charge_automatically",
});
await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
{
CollectionMethod = collectionMethod,
});
}
organization.Seats = (short?)newSeatTotal;
await ReplaceAndUpdateCache(organization);

13
src/Core/Services/Implementations/StripePaymentService.cs
View File

@ -732,6 +732,8 @@ namespace Bit.Core.Services
var prorationDate = DateTime.UtcNow;
var storageItem = sub.Items?.FirstOrDefault(i => i.Plan.Id == storagePlanId);
// Retain original collection method
var collectionMethod = sub.CollectionMethod;
var subResponse = await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
{
@ -778,17 +780,20 @@ namespace Bit.Core.Services
// This proration behavior prevents a false "credit" from
// being applied forward to the next month's invoice
ProrationBehavior = "none",
CollectionMethod = "charge_automatically",
CollectionMethod = collectionMethod,
});
throw;
}
}
// Change back the subscription collection method
await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
if (collectionMethod != "send_invoice")
{
CollectionMethod = "charge_automatically",
});
await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
{
CollectionMethod = collectionMethod,
});
}
return paymentIntentClientSecret;
}