nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-04 09:32:48 -05:00
Code Activity

Billing addr line1 fix, pr feedback

Browse Source
This commit is contained in:
Chad Scharf
2020-06-15 09:12:03 -04:00
parent 1552ff7b29
commit b2cb9a2f69
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ namespace Bit.Core.Services
Country = taxInfo.BillingAddressCountry,
PostalCode = taxInfo.BillingAddressPostalCode,
// Line1 is required in Stripe's API, suggestion in Docs is to use Business Name intead.
Line1 = taxInfo.BillingAddressLine1 ?? org.BusinessName,
Line1 = taxInfo.BillingAddressLine1 ?? string.Empty,
Line2 = taxInfo.BillingAddressLine2,
City = taxInfo.BillingAddressCity,
State = taxInfo.BillingAddressState,
@ -1536,7 +1536,7 @@ namespace Bit.Core.Services
// Line1 is required, so if missing we're using the subscriber name
// see: https://stripe.com/docs/api/customers/create#create_customer-address-line1
if (address != null && address.Line1 == subscriber.BillingName())
if (address != null && string.IsNullOrWhiteSpace(address.Line1))
{
address.Line1 = null;
}
@ -1565,7 +1565,7 @@ namespace Bit.Core.Services
{
Address = new AddressOptions
{
Line1 = taxInfo.BillingAddressLine1 ?? subscriber.BillingName(),
Line1 = taxInfo.BillingAddressLine1 ?? string.Empty,
Line2 = taxInfo.BillingAddressLine2,
City = taxInfo.BillingAddressCity,
State = taxInfo.BillingAddressState,