trueog/glitchtip-backend
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new email base template and extend it for new throttle warning email

Browse Source
This commit is contained in:
James Kiger committed 2024-10-21 10:50:02 -04:00
1 parent 70516268c6
commit 7eb460f784
4 files changed
+268 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/organizations_ext/email.py
+1 -1
View File
@@ -21,13 +21,13 @@ class MetQuotaEmail(DetailEmail):
base_url = settings.GLITCHTIP_URL.geturl()
organization = self.object
subscription_link = f"{base_url}/{organization.slug}/settings/subscription"
context["organization_name"] = organization.name
product = Product.objects.filter(
plan__subscriptions__customer__subscriber=organization,
plan__subscriptions__status="active",
).first()
context.update(
{
"organization": organization,
"product": product,
"event_limit": product.metadata.get("events") if product else None,
"subscription_link": subscription_link,
apps/organizations_ext/templates/organizations/met-quota-drip.html
+41 -2
View File
@@ -1,3 +1,42 @@
{% extends "email/email_base.html" %}
{% load static settings %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en" style="background:#fafafa!important"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="viewport" content="width=device-width"><title>Met event quota for {{ organization_name }}</title><style>@media only screen{html{min-height:100%;background:#fafafa}}@media only screen and (max-width:596px){table.body img{width:auto;height:auto}table.body center{min-width:0!important}table.body .container{width:95%!important}table.body .columns{height:auto!important;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:16px!important;padding-right:16px!important}table.body .collapse .columns{padding-left:0!important;padding-right:0!important}th.small-12{display:inline-block!important;width:100%!important}table.menu{width:100%!important}table.menu td,table.menu th{width:auto!important;display:inline-block!important}table.menu.vertical td,table.menu.vertical th{display:block!important}}</style></head><body style="-moz-box-sizing:border-box;-ms-text-size-adjust:100%;-webkit-box-sizing:border-box;-webkit-text-size-adjust:100%;Margin:0;background:#fafafa!important;box-sizing:border-box;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;min-width:100%;padding:0;text-align:left;width:100%!important">
<span class="preheader" style="color:#fafafa;display:none!important;font-size:1px;line-height:1px;max-height:0;max-width:0;mso-hide:all!important;opacity:0;overflow:hidden;visibility:hidden"></span><table class="body" style="Margin:0;background:#fafafa!important;border-collapse:collapse;border-spacing:0;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;height:100%;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;width:100%"><tr style="padding:0;text-align:left;vertical-align:top"><td class="center" align="center" valign="top" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"><center data-parsed style="min-width:580px;width:100%"><table class="spacer float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%"><tbody><tr style="padding:0;text-align:left;vertical-align:top"><td height="16px" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:16px;margin:0;mso-line-height-rule:exactly;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">&#xA0;</td></tr></tbody></table><table align="center" class="container header float-center" style="Margin:0 auto;background:#fafafa;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:580px"><tbody><tr style="padding:0;text-align:left;vertical-align:top"><td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"><table class="row collapse" style="border-collapse:collapse;border-spacing:0;display:table;padding:0;position:relative;text-align:left;vertical-align:top;width:100%"><tbody><tr style="padding:0;text-align:left;vertical-align:top"><th class="small-12 large-12 columns first last" style="Margin:0 auto;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0 auto;padding:0;padding-bottom:0;padding-left:0;padding-right:0;text-align:left;width:588px"><table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"><tr style="padding:0;text-align:left;vertical-align:top"><th style="Margin:0;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0;text-align:left"><img src="{% get_domain %}{% static 'images/logo.png' %}" alt width="150" height="37" style="-ms-interpolation-mode:bicubic;clear:both;display:block;max-width:150px;outline:0;text-decoration:none;width:auto"></th><th class="expander" style="Margin:0;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0;padding:0!important;text-align:left;visibility:hidden;width:0"></th></tr></table></th></tr></tbody></table></td></tr></tbody></table><table class="spacer float-center" style="Margin:0 auto;border-collapse:collapse;border-spacing:0;float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:100%"><tbody><tr style="padding:0;text-align:left;vertical-align:top"><td height="16px" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:16px;margin:0;mso-line-height-rule:exactly;padding:0;text-align:left;vertical-align:top;word-wrap:break-word">&#xA0;</td></tr></tbody></table><table align="center" class="container body-drip float-center" style="Margin:0 auto;background:#fefefe;border-collapse:collapse;border-spacing:0;box-shadow:0 2px 1px -1px rgba(0,0,0,.2),0 1px 1px 0 rgba(0,0,0,.14),0 1px 3px 0 rgba(0,0,0,.12);float:none;margin:0 auto;padding:0;text-align:center;vertical-align:top;width:580px"><tbody><tr style="padding:0;text-align:left;vertical-align:top"><td style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;color:#0a0a0a;font-family:Helvetica,Arial,sans-serif;font-size:16px;font-weight:400;hyphens:auto;line-height:1.3;margin:0;padding:0;text-align:left;vertical-align:top;word-wrap:break-word"><table class="spacer" style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"><tbody><tr style="padding:0;text-align:left;vertical-align:top"><td height="16px" style="-moz-hyphens:auto;-webkit-hyphens:auto;Margin:0;border-collapse:collapse!important;cLine truncated
{% block title_text %}
Met event quota for {{ organization.name|striptags }}
{% endblock %}
{% block content %}
<tr>
<td style="background-color: #fefefe;">
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td style="padding: 20px; font-family: Helvetica, Arial, sans-serif; font-size: 16px; line-height: 20px; color: #0a0a0a;">
<p style="margin: 0;">
Hello and thank you for using GlitchTip. We noticed your organization <b>{{ organization.name|striptags }}</b>
has exceeded its monthly event limit on your {{ product.name }} and wanted to give you a heads up.
Your plan allows for {{event_limit}} events, but for the current billing period we have received
###EVENT_COUNT### events for your organization. Here are a couple options to avoid this in the future.
</p>
</td>
</tr>
<tr>
<td style="padding: 0 20px 20px 20px; font-family: Helvetica, Arial, sans-serif; font-size: 16px; line-height: 20px; color: #0a0a0a;">
<ul style="padding: 0; margin: 0 0 20px 0; list-style-type: disc;">
<li style="margin:0 0 6px 30px;" class="list-item-first">
<a href="{{ subscription_link }}" style="color: #e94056; text-decoration: none;">Upgrade</a>
to a new plan for more events
</li>
<li style="margin:0 0 0px 30px;">
Configure your SDK to send a lower rate of events to GlitchTip
</li>
</ul>
<p style="margin: 0;">
In the meantime, we have placed a {{ organization.event_throttle_rate }}% throttle on incoming
events from projects on your organization account for this billing period. If you choose to
upgrade your plan, this throttle will be removed. Otherwise, it will reset at the beginning
of your next billing cycle.
</p>
</td>
</tr>
</table>
</td>
</tr>
{% endblock %}
apps/organizations_ext/templates/organizations/met-quota-drip.txt
+12 -5
View File
@@ -1,5 +1,12 @@
You have reached your event quota
Organization: {{ organization_name }}
Your plan allows for {{ event_limit }} events per month, and your projects have exceeded that limit.
You will no longer receive events until the monthly cycle resets, or you upgrade your plan.
Manage your subscription: {{ subscription_link }}"
Hello and thank you for using GlitchTip. We noticed your organization {{ organization.name|striptags }}
has exceeded its monthly event limit on your {{ product.name }} and wanted to give you a heads up.
Your plan allows for {{ event_limit }} events, but for the current billing period we have received
###EVENT_COUNT### events for your organization. Here are a couple options to avoid this in the future.
Upgrade to a new plan for more events at this link: {{ subscription_link }}
Configure your SDK to send a lower rate of events to GlitchTip
In the meantime, we have placed a {{ organization.event_throttle_rate }}% throttle on incoming events
from projects on your organization account for this billing period. If you choose to upgrade your plan,
this throttle will be removed. Otherwise, it will reset at the beginning of your next billing cycle.
templates/email/email_base.html
+214
View File
@@ -0,0 +1,214 @@
{% load static settings %}
<!-- Based on Cerberus email templates: https://www.cerberusemail.com/templates -->
<!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office">
<head>
<meta charset="utf-8"> <!-- utf-8 works for most cases -->
<meta name="viewport" content="width=device-width"> <!-- Forcing initial-scale shouldn't be necessary -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <!-- Use the latest (edge) version of IE rendering engine -->
<meta name="x-apple-disable-message-reformatting"> <!-- Disable auto-scale in iOS 10 Mail entirely -->
<meta name="format-detection" content="telephone=no,address=no,email=no,date=no,url=no"> <!-- Tell iOS not to automatically link certain text strings. -->
<meta name="color-scheme" content="light dark">
<meta name="supported-color-schemes" content="light dark">
<title>
{% block title_text %}{% endblock %}
</title> <!-- The title tag shows in email notifications, like Android 4.4. -->
<!-- CSS Reset : BEGIN -->
<style>
/* What it does: Tells the email client that both light and dark styles are provided. A duplicate of meta color-scheme meta tag above. */
:root {
color-scheme: light dark;
supported-color-schemes: light dark;
}
/* What it does: Remove spaces around the email design added by some email clients. */
/* Beware: It can remove the padding / margin and add a background color to the compose a reply window. */
html,
body {
margin: 0 auto !important;
padding: 0 !important;
height: 100% !important;
width: 100% !important;
}
/* What it does: Stops email clients resizing small text. */
* {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
/* What it does: Centers email on Android 4.4 */
div[style*="margin: 16px 0"] {
margin: 0 !important;
}
/* What it does: forces Samsung Android mail clients to use the entire viewport */
#MessageViewBody, #MessageWebViewDiv{
width: 100% !important;
}
/* What it does: Stops Outlook from adding extra spacing to tables. */
table,
td {
mso-table-lspace: 0pt !important;
mso-table-rspace: 0pt !important;
}
/* What it does: Fixes webkit padding issue. */
table {
border-spacing: 0 !important;
border-collapse: collapse !important;
table-layout: fixed !important;
margin: 0 auto !important;
}
/* What it does: Uses a better rendering method when resizing images in IE. */
img {
-ms-interpolation-mode:bicubic;
}
/* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
a {
text-decoration: none;
}
/* What it does: A work-around for email clients meddling in triggered links. */
a[x-apple-data-detectors], /* iOS */
.unstyle-auto-detected-links a,
.aBn {
border-bottom: 0 !important;
cursor: default !important;
color: inherit !important;
text-decoration: none !important;
font-size: inherit !important;
font-family: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
}
/* What it does: Prevents Gmail from displaying a download button on large, non-linked images. */
.a6S {
display: none !important;
opacity: 0.01 !important;
}
/* What it does: Prevents Gmail from changing the text color in conversation threads. */
.im {
color: inherit !important;
}
/* If the above doesn't work, add a .g-img class to any image in question. */
img.g-img + div {
display: none !important;
}
/* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89 */
/* Create one of these media queries for each additional viewport size you'd like to fix */
/* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
@media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
u ~ div .email-container {
min-width: 320px !important;
}
}
/* iPhone 6, 6S, 7, 8, and X */
@media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
u ~ div .email-container {
min-width: 375px !important;
}
}
/* iPhone 6+, 7+, and 8+ */
@media only screen and (min-device-width: 414px) {
u ~ div .email-container {
min-width: 414px !important;
}
}
</style>
<!-- CSS Reset : END -->
<!-- Progressive Enhancements : BEGIN -->
<style>
@media screen and (max-width: 600px) {
/* What it does: Adjust typography on small screens to improve readability */
.email-container {
p, li{
font-size: 17px !important;
}
}
}
</style>
<!-- Progressive Enhancements : END -->
</head>
<!--
The email background color is defined in three places:
1. body tag: for most email clients
2. center tag: for Gmail and Inbox mobile apps and web versions of Gmail, GSuite, Inbox, Yahoo, AOL, Libero, Comcast, freenet, Mail.ru, Orange.fr
3. mso conditional: For Windows 10 Mail
-->
<body width="100%" style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly; background-color: #fafafa;" class="email-bg">
<center role="article" aria-roledescription="email" lang="en" style="width: 100%; background-color: #fafafa;" class="email-bg">
<!--[if mso | IE]>
<table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #fafafa;" class="email-bg">
<tr>
<td>
<![endif]-->
<!--
Set the email width. Defined in two places:
1. max-width for all clients except Desktop Windows Outlook, allowing the email to squish on narrow but never go wider than 600px.
2. MSO tags for Desktop Windows Outlook enforce a 600px width.
-->
<div style="max-width: 600px; margin: 0 auto;" class="email-container">
<!--[if mso]>
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="600">
<tr>
<td>
<![endif]-->
<!-- Email Body : BEGIN -->
<table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%" style="margin: auto;">
<!-- Email Header : BEGIN -->
<tr>
<td style="padding: 20px 0 12px 0; text-align: left">
<img src="{% get_domain %}{% static 'images/logo.png' %}" width="200" height="50" alt="alt_text" border="0" style="height: auto; background: #fafafa;">
</td>
</tr>
<!-- Email Header : END -->
<tr>
<td style="background-color: #fefefe;" class="darkmode-bg">
<table role="presentation" cellspacing="0" cellpadding="0" width="100%">
{% block content %}{% endblock %}
</table>
</td>
</tr>
</table>
<!-- Email Body : END -->
<!--[if mso]>
</td>
</tr>
</table>
<![endif]-->
</div>
<!--[if mso | IE]>
</td>
</tr>
</table>
<![endif]-->
</center>
</body>
</html>