diff --git a/src/Billing/Controllers/StripeController.cs b/src/Billing/Controllers/StripeController.cs index b42d205920..55ef492b3c 100644 --- a/src/Billing/Controllers/StripeController.cs +++ b/src/Billing/Controllers/StripeController.cs @@ -166,7 +166,7 @@ namespace Bit.Billing.Controllers { var items = invoice.Lines.Select(i => i.Description).ToList(); await _mailService.SendInvoiceUpcomingAsync(email, invoice.AmountDue / 100M, - invoice.NextPaymentAttempt.Value, items, ids.Item1.HasValue); + invoice.NextPaymentAttempt.Value, items, true); } } else if(parsedEvent.Type.Equals("charge.succeeded")) @@ -409,7 +409,10 @@ namespace Bit.Billing.Controllers if(!transactionResult.IsSuccess()) { - // TODO: Send payment failure email? + if(invoice.AttemptCount < 4) + { + await _mailService.SendPaymentFailedAsync(customer.Email, btInvoiceAmount, true); + } return false; } diff --git a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs index 735a131979..8e31d00641 100644 --- a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs +++ b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs @@ -23,7 +23,7 @@ {{#if MentionInvoices}} - Invoices for your payments can also be downloaded from Billing page for your account. + Invoices for your subscription can also be downloaded from the Billing page for your account. {{/if}} diff --git a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs index 281edb29dd..2118165e2e 100644 --- a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs +++ b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs @@ -12,7 +12,7 @@ Summary Of Charges To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account. {{#if MentionInvoices}} -Invoices for your payments can also be downloaded from Billing page for your account. +Invoices for your subscription can also be downloaded from the Billing page for your account. {{/if}} If you have any questions or problems, please feel free to email us at hello@bitwarden.com. diff --git a/src/Core/MailTemplates/Handlebars/PaymentFailed.html.hbs b/src/Core/MailTemplates/Handlebars/PaymentFailed.html.hbs new file mode 100644 index 0000000000..659f1f9a9b --- /dev/null +++ b/src/Core/MailTemplates/Handlebars/PaymentFailed.html.hbs @@ -0,0 +1,26 @@ +{{#>FullHtmlLayout}} + + + + + + + + {{#if MentionInvoices}} + + + + {{/if}} + + + +
+ We wanted to let you know that a {{usd Amount}} payment for your subscription with Bitwarden was unsuccessful. We will re-attempt to collect payment a few more times over the coming days. +
+ To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{link WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account. +
+ Invoices for your subscription can also be downloaded from the Billing page for your account. +
+ If you have any questions or problems, please feel free to email us at hello@bitwarden.com. +
+{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/PaymentFailed.text.hbs b/src/Core/MailTemplates/Handlebars/PaymentFailed.text.hbs new file mode 100644 index 0000000000..9a366d1349 --- /dev/null +++ b/src/Core/MailTemplates/Handlebars/PaymentFailed.text.hbs @@ -0,0 +1,11 @@ +{{#>BasicTextLayout}} +We wanted to let you know that a {{usd Amount}} payment for your subscription with Bitwarden was unsuccessful. We will re-attempt to collect payment a few more times over the coming days. + +To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account. +{{#if MentionInvoices}} + +Invoices for your subscription can also be downloaded from the Billing page for your account. +{{/if}} + +If you have any questions or problems, please feel free to email us at hello@bitwarden.com. +{{/BasicTextLayout}} \ No newline at end of file diff --git a/src/Core/Models/Mail/PaymentFailedViewModel.cs b/src/Core/Models/Mail/PaymentFailedViewModel.cs new file mode 100644 index 0000000000..1eb5e6952c --- /dev/null +++ b/src/Core/Models/Mail/PaymentFailedViewModel.cs @@ -0,0 +1,8 @@ +namespace Bit.Core.Models.Mail +{ + public class PaymentFailedViewModel : BaseMailModel + { + public decimal Amount { get; set; } + public bool MentionInvoices { get; set; } + } +} diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index f43dc3c147..639cb30629 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -16,10 +16,13 @@ namespace Bit.Core.Services Task SendNoMasterPasswordHintEmailAsync(string email); Task SendMasterPasswordHintEmailAsync(string email, string hint); Task SendOrganizationInviteEmailAsync(string organizationName, OrganizationUser orgUser, string token); - Task SendOrganizationAcceptedEmailAsync(string organizationName, string userEmail, IEnumerable adminEmails); + Task SendOrganizationAcceptedEmailAsync(string organizationName, string userEmail, + IEnumerable adminEmails); Task SendOrganizationConfirmedEmailAsync(string organizationName, string email); Task SendPasswordlessSignInAsync(string returnUrl, string token, string email); - Task SendInvoiceUpcomingAsync(string email, decimal amount, DateTime dueDate, List items, bool mentionInvoices); + Task SendInvoiceUpcomingAsync(string email, decimal amount, DateTime dueDate, List items, + bool mentionInvoices); + Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices); Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip); } } diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index 7f2d9e0c51..52d5a3b275 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -236,6 +236,21 @@ namespace Bit.Core.Services await _mailDeliveryService.SendEmailAsync(message); } + public async Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices) + { + var message = CreateDefaultMessage("Payment Failed", email); + var model = new PaymentFailedViewModel + { + WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash, + SiteName = _globalSettings.SiteName, + Amount = amount, + MentionInvoices = mentionInvoices + }; + await AddMessageContentAsync(message, "PaymentFailed", model); + message.MetaData.Add("SendGridCategories", new List { "PaymentFailed" }); + await _mailDeliveryService.SendEmailAsync(message); + } + public async Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip) { var message = CreateDefaultMessage($"New Device Logged In From {deviceType}", email); diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs index 5857555f29..453adf9b7f 100644 --- a/src/Core/Services/NoopImplementations/NoopMailService.cs +++ b/src/Core/Services/NoopImplementations/NoopMailService.cs @@ -73,6 +73,11 @@ namespace Bit.Core.Services return Task.FromResult(0); } + public Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices) + { + return Task.FromResult(0); + } + public Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip) { return Task.FromResult(0);