Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Add enterprise plans
Uku Taht6a5b383e2b83
diff --git a/config/runtime.exs b/config/runtime.exsindex f31c2bc41b..103537cd50 100644--- a/config/runtime.exs+++ b/config/runtime.exs@@ -377,6 +377,14 @@ config :kaffy,resources: [site: [schema: Plausible.Site, admin: Plausible.SiteAdmin]]+ ],+ billing: [+ resources: [+ enterprise_plan: [+ schema: Plausible.Billing.EnterprisePlan,+ admin: Plausible.Billing.EnterprisePlanAdmin+ ]+ ]]]diff --git a/lib/plausible/auth/user.ex b/lib/plausible/auth/user.exindex a367672b0e..5c0fe34cc3 100644--- a/lib/plausible/auth/user.ex+++ b/lib/plausible/auth/user.ex@@ -25,6 +25,7 @@ defmodule Plausible.Auth.User dohas_many :api_keys, Plausible.Auth.ApiKeyhas_one :google_auth, Plausible.Site.GoogleAuthhas_one :subscription, Plausible.Billing.Subscription+ has_one :enterprise_plan, Plausible.Billing.EnterprisePlantimestamps()enddiff --git a/lib/plausible/billing/enterprise_plan.ex b/lib/plausible/billing/enterprise_plan.exnew file mode 100644index 0000000000..6514109832--- /dev/null+++ b/lib/plausible/billing/enterprise_plan.ex@@ -0,0 +1,30 @@+defmodule Plausible.Billing.EnterprisePlan do+ use Ecto.Schema+ import Ecto.Changeset++ @required_fields [+ :user_id,+ :paddle_plan_id,+ :billing_interval,+ :monthly_pageview_limit,+ :hourly_api_request_limit+ ]++ schema "enterprise_plans" do+ field :paddle_plan_id, :string+ field :billing_interval, Ecto.Enum, values: [:monthly, :yearly]+ field :monthly_pageview_limit, :integer+ field :hourly_api_request_limit, :integer++ belongs_to :user, Plausible.Auth.User++ timestamps()+ end++ def changeset(model, attrs \\ %{}) do+ model+ |> cast(attrs, @required_fields)+ |> validate_required(@required_fields)+ |> unique_constraint(:user_id)+ end+enddiff --git a/lib/plausible/billing/enterprise_plan_admin.ex b/lib/plausible/billing/enterprise_plan_admin.exnew file mode 100644index 0000000000..616eea5b66--- /dev/null+++ b/lib/plausible/billing/enterprise_plan_admin.ex@@ -0,0 +1,37 @@+defmodule Plausible.Billing.EnterprisePlanAdmin do+ use Plausible.Repo++ def search_fields(_schema) do+ [+ :paddle_plan_id,+ user: [:name, :email]+ ]+ end++ def form_fields(_) do+ [+ user_id: nil,+ paddle_plan_id: nil,+ billing_interval: %{choices: [{"Yearly", "yearly"}, {"Monthly", "monthly"}]},+ monthly_pageview_limit: nil,+ hourly_api_request_limit: nil+ ]+ end++ def custom_index_query(_conn, _schema, query) do+ from(r in query, preload: :user)+ end++ def index(_) do+ [+ id: nil,+ user_email: %{value: &get_user_email/1},+ paddle_plan_id: nil,+ billing_interval: nil,+ monthly_pageview_limit: nil,+ hourly_api_request_limit: nil+ ]+ end++ defp get_user_email(plan), do: plan.user.email+enddiff --git a/lib/plausible/billing/plans.ex b/lib/plausible/billing/plans.exindex 7cc0895a41..9f7d7062a6 100644--- a/lib/plausible/billing/plans.ex+++ b/lib/plausible/billing/plans.ex@@ -1,4 +1,6 @@defmodule Plausible.Billing.Plans do+ use Plausible.Repo+@unlisted_plans_v1 [%{limit: 150_000_000, yearly_product_id: "648089", yearly_cost: "$4800"}]@@ -30,21 +32,15 @@ defmodule Plausible.Billing.Plans doend)end- def subscription_quota("free_10k"), do: "10k"-- def subscription_quota(product_id) do- case for_product_id(product_id) do- nil -> raise "Unknown quota for subscription #{product_id}"- product -> number_format(product[:limit])- end- end-def subscription_interval("free_10k"), do: "N/A"def subscription_interval(product_id) docase for_product_id(product_id) donil ->- raise "Unknown interval for subscription #{product_id}"+ enterprise_plan =+ Repo.get_by(Plausible.Billing.EnterprisePlan, paddle_plan_id: product_id)++ enterprise_plan && enterprise_plan.billing_intervalplan ->if product_id == plan[:monthly_product_id] do@@ -62,6 +58,11 @@ defmodule Plausible.Billing.Plans doif found doMap.fetch!(found, :limit)+ else+ enterprise_plan =+ Repo.get_by(Plausible.Billing.EnterprisePlan, paddle_plan_id: subscription.paddle_plan_id)++ enterprise_plan && enterprise_plan.monthly_pageview_limitendenddiff --git a/lib/plausible/mailer.ex b/lib/plausible/mailer.exindex 83fd6ba80e..8768e542a3 100644--- a/lib/plausible/mailer.ex+++ b/lib/plausible/mailer.ex@@ -14,4 +14,16 @@ defmodule Plausible.Mailer doreraise error, __STACKTRACE__endend++ def send_email_safe(email) do+ try do+ Plausible.Mailer.deliver_now!(email)+ rescue+ error ->+ Sentry.capture_exception(error,+ stacktrace: __STACKTRACE__,+ extra: %{extra: "Error while sending email"}+ )+ end+ endenddiff --git a/lib/plausible_web/controllers/billing_controller.ex b/lib/plausible_web/controllers/billing_controller.exindex 5de38f183a..7b81f276fa 100644--- a/lib/plausible_web/controllers/billing_controller.ex+++ b/lib/plausible_web/controllers/billing_controller.ex@@ -6,20 +6,122 @@ defmodule PlausibleWeb.BillingController doplug PlausibleWeb.RequireAccountPlug- def admin_email do- Application.get_env(:plausible, :admin_email)+ def upgrade(conn, _params) do+ user =+ conn.assigns[:current_user]+ |> Repo.preload(:enterprise_plan)++ cond do+ user.subscription && user.subscription.status == "active" ->+ redirect(conn, to: Routes.billing_path(conn, :change_plan_form))++ user.enterprise_plan ->+ redirect(conn,+ to: Routes.billing_path(conn, :upgrade_enterprise_plan, user.enterprise_plan.id)+ )++ true ->+ render(conn, "upgrade.html",+ usage: Plausible.Billing.usage(user),+ user: user,+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )+ endend- def change_plan_form(conn, _params) do- subscription = Billing.active_subscription_for(conn.assigns[:current_user].id)+ def upgrade_enterprise_plan(conn, %{"plan_id" => plan_id}) do+ user =+ conn.assigns[:current_user]+ |> Repo.preload(:enterprise_plan)- if subscription do- render(conn, "change_plan.html",- subscription: subscription,+ if user.enterprise_plan && user.enterprise_plan.id == String.to_integer(plan_id) do+ usage = Plausible.Billing.usage(conn.assigns[:current_user])++ render(conn, "upgrade_to_plan.html",+ usage: usage,+ user: user,layout: {PlausibleWeb.LayoutView, "focus.html"})else- redirect(conn, to: "/billing/upgrade")+ render_error(conn, 404)+ end+ end++ def upgrade_to_plan(conn, %{"plan_id" => plan_id}) do+ plan = Plausible.Billing.Plans.for_product_id(plan_id)++ if plan do+ cycle = if plan[:monthly_product_id] == plan_id, do: "monthly", else: "yearly"+ plan = Map.merge(plan, %{cycle: cycle, product_id: plan_id})+ usage = Plausible.Billing.usage(conn.assigns[:current_user])++ render(conn, "upgrade_to_plan.html",+ usage: usage,+ plan: plan,+ user: conn.assigns[:current_user],+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )+ else+ render_error(conn, 404)+ end+ end++ def upgrade_success(conn, _params) do+ render(conn, "upgrade_success.html", layout: {PlausibleWeb.LayoutView, "focus.html"})+ end++ def change_plan_form(conn, _params) do+ user =+ conn.assigns[:current_user]+ |> Repo.preload(:enterprise_plan)++ subscription = Billing.active_subscription_for(user.id)++ cond do+ subscription && user.enterprise_plan ->+ redirect(conn,+ to: Routes.billing_path(conn, :change_enterprise_plan, user.enterprise_plan.id)+ )++ subscription ->+ render(conn, "change_plan.html",+ subscription: subscription,+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )++ true ->+ redirect(conn, to: Routes.billing_path(conn, :upgrade))+ end+ end++ def change_enterprise_plan(conn, %{"plan_id" => plan_id}) do+ user =+ conn.assigns[:current_user]+ |> Repo.preload(:enterprise_plan)++ cond do+ is_nil(user.subscription) ->+ redirect(conn, to: "/billing/upgrade")++ is_nil(user.enterprise_plan) ->+ render_error(conn, 404)++ user.enterprise_plan.id !== String.to_integer(plan_id) ->+ render_error(conn, 404)++ user.enterprise_plan.paddle_plan_id == user.subscription.paddle_plan_id ->+ render(conn, "change_enterprise_plan_contact_us.html",+ user: user,+ plan: user.enterprise_plan,+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )++ true ->+ render(conn, "change_enterprise_plan.html",+ user: user,+ plan: user.enterprise_plan,+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )endend@@ -77,39 +179,4 @@ defmodule PlausibleWeb.BillingController do|> redirect(to: "/settings")endend-- def upgrade(conn, _params) do- usage = Plausible.Billing.usage(conn.assigns[:current_user])- today = Timex.today()-- render(conn, "upgrade.html",- usage: usage,- today: today,- user: conn.assigns[:current_user],- layout: {PlausibleWeb.LayoutView, "focus.html"}- )- end-- def upgrade_to_plan(conn, %{"plan_id" => plan_id}) do- plan = Plausible.Billing.Plans.for_product_id(plan_id)-- if plan do- cycle = if plan[:monthly_product_id] == plan_id, do: "monthly", else: "yearly"- plan = Map.merge(plan, %{cycle: cycle, product_id: plan_id})- usage = Plausible.Billing.usage(conn.assigns[:current_user])-- render(conn, "upgrade_to_plan.html",- usage: usage,- plan: plan,- user: conn.assigns[:current_user],- layout: {PlausibleWeb.LayoutView, "focus.html"}- )- else- render_error(conn, 404)- end- end-- def upgrade_success(conn, _params) do- render(conn, "upgrade_success.html", layout: {PlausibleWeb.LayoutView, "focus.html"})- endenddiff --git a/lib/plausible_web/email.ex b/lib/plausible_web/email.exindex d21b1008c0..d2f6fee7bb 100644--- a/lib/plausible_web/email.ex+++ b/lib/plausible_web/email.ex@@ -119,7 +119,7 @@ defmodule PlausibleWeb.Email dobase_email()|> to(user)|> tag("over-limit")- |> subject("You have outgrown your Plausible subscription tier ")+ |> subject("You have outgrown your Plausible subscription tier")|> render("over_limit.html", %{user: user,usage: usage,@@ -128,6 +128,18 @@ defmodule PlausibleWeb.Email do})end+ def enterprise_over_limit_email(user, usage, last_cycle) do+ base_email()+ |> to("[email protected]")+ |> tag("enterprise-over-limit")+ |> subject("#{user.email} has outgrown their enterprise plan")+ |> render("enterprise_over_limit.html", %{+ user: user,+ usage: usage,+ last_cycle: last_cycle+ })+ end+def yearly_renewal_notification(user) dodate = Timex.format!(user.subscription.next_bill_date, "{Mfull} {D}, {YYYY}")diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex 158da85013..233a814ce7 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -147,6 +147,8 @@ defmodule PlausibleWeb.Router dopost "/billing/change-plan/:new_plan_id", BillingController, :change_planget "/billing/upgrade", BillingController, :upgradeget "/billing/upgrade/:plan_id", BillingController, :upgrade_to_plan+ get "/billing/upgrade/enterprise/:plan_id", BillingController, :upgrade_enterprise_plan+ get "/billing/change-plan/enterprise/:plan_id", BillingController, :change_enterprise_planget "/billing/upgrade-success", BillingController, :upgrade_successget "/sites", SiteController, :indexdiff --git a/lib/plausible_web/templates/billing/change_enterprise_plan.html.eex b/lib/plausible_web/templates/billing/change_enterprise_plan.html.eexnew file mode 100644index 0000000000..81318c05b4--- /dev/null+++ b/lib/plausible_web/templates/billing/change_enterprise_plan.html.eex@@ -0,0 +1,68 @@+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fetch-jsonp/1.1.3/fetch-jsonp.min.js"></script>+<div class="mx-auto mt-6 text-center">+ <h1 class="text-3xl font-black dark:text-gray-100">Change subscription plan</h1>+</div>++<script>+ plan = function() {+ return {+ localizedPlan: null,+ price() {+ var currency = {+ 'USD': '$',+ 'EUR': '€',+ 'GBP': '£'+ }[this.localizedPlan.currency]++ return currency + this.localizedPlan.price.net+ },+ fetchPlan() {+ fetchJsonp('https://checkout.paddle.com/api/2.0/prices?product_ids=<%= @plan.paddle_plan_id %>')+ .then(res => res.json())+ .then((data) => {+ this.localizedPlan = data.response.products[0]+ })+ }+ }+ }+</script>++<div class="w-full max-w-lg px-4 mx-auto mt-4">+ <div x-init="fetchPlan()" x-data="window.plan()" class="flex-1 p-8 mt-8 bg-white rounded shadow-md dark:bg-gray-800">+ <div x-show="!localizedPlan" class="mx-auto my-40 loading sm"><div></div></div>+ <template x-if="localizedPlan">+ <div>+ <div class="w-full pb-4 dark:text-gray-100">+ <span>We've prepared your account for an upgrade to custom limits outside the listed plans:</span>+ </div>++ <ul class="w-full py-4 dark:text-gray-100">+ <li>Up to <b><%= PlausibleWeb.StatsView.large_number_format(@plan.monthly_pageview_limit) %></b> monthly pageviews</li>+ <li>Up to <b><%= PlausibleWeb.StatsView.large_number_format(@plan.hourly_api_request_limit) %></b> hourly api requests</li>+ </ul>++ <ul class="w-full py-4 dark:text-gray-100">+ <span>The plan is priced at</span>+ <template x-if="localizedPlan"><b x-text="price()"></b> </template>+ <span>per <%= if @plan.billing_interval == :yearly, do: "year", else: "month" %>. On the next page, our payment provider will calculate the prorated amount that your card will be charged if you decide to upgrade now.</span>+ </ul>++ <div class="mt-6 text-left">+ <span class="inline-flex w-full rounded-md shadow-sm">+ <%= link(to: Routes.billing_path(@conn, :change_plan_preview, @plan.paddle_plan_id), class: "inline-flex items-center px-4 py-2 text-sm font-medium text-white bg-indigo-600 border border-transparent leading-5 rounded-md hover:bg-indigo-500 focus:outline-none focus:border-indigo-700 focus:ring active:bg-indigo-700 transition ease-in-out duration-150 ") do %>+ <svg fill="currentColor" viewBox="0 0 20 20" class="inline w-4 h-4 mr-2"><path d="M10 12a2 2 0 100-4 2 2 0 000 4z"></path><path fill-rule="evenodd" d="M.458 10C1.732 5.943 5.522 3 10 3s8.268 2.943 9.542 7c-1.274 4.057-5.064 7-9.542 7S1.732 14.057.458 10zM14 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd"></path></svg>+ Preview changes+ <% end %>+ </span>+ </div>+ </div>+ </template>+ </div>+</div>++<div class="mt-8 text-center dark:text-gray-100">+ Questions? Contact <%= link("[email protected]", to: "mailto: [email protected]", class: "text-indigo-500") %>+</div>++<script type="text/javascript" src="https://cdn.paddle.com/paddle/paddle.js"></script>+<script>Paddle.Setup({vendor: 49430})</script>diff --git a/lib/plausible_web/templates/billing/change_enterprise_plan_contact_us.html.eex b/lib/plausible_web/templates/billing/change_enterprise_plan_contact_us.html.eexnew file mode 100644index 0000000000..67a85d883d--- /dev/null+++ b/lib/plausible_web/templates/billing/change_enterprise_plan_contact_us.html.eex@@ -0,0 +1,16 @@+<div class="mx-auto mt-6 text-center">+ <h1 class="text-3xl font-black dark:text-gray-100">Change subscription plan</h1>+</div>++<div class="w-full max-w-lg px-4 mx-auto mt-4">+ <div class="flex-1 p-8 mt-8 bg-white rounded shadow-md dark:bg-gray-800">+ <div class="w-full pb-4 dark:text-gray-100">+ <span>Need to change your limits?</span>+ </div>++ <ul class="w-full py-4 dark:text-gray-100">+ <span>Your account is on an enterprise plan. If you want to increase or decrease the limits on your account, please contact us at [email protected]</span>+ </ul>++ </div>+</div>diff --git a/lib/plausible_web/templates/billing/change_plan_preview.html.eex b/lib/plausible_web/templates/billing/change_plan_preview.html.eexindex 8622e19aa2..98cf7e215c 100644--- a/lib/plausible_web/templates/billing/change_plan_preview.html.eex+++ b/lib/plausible_web/templates/billing/change_plan_preview.html.eex@@ -36,7 +36,7 @@<div class="pt-6"></div>- <div class="py-2 text-lg font-bold">Next payment</div>+ <div class="py-4 dark:text-gray-100 text-lg font-bold">Next payment</div><div class="flex flex-col">diff --git a/lib/plausible_web/templates/billing/upgrade.html.eex b/lib/plausible_web/templates/billing/upgrade.html.eexindex 569e383ba6..c2d9c4e827 100644--- a/lib/plausible_web/templates/billing/upgrade.html.eex+++ b/lib/plausible_web/templates/billing/upgrade.html.eex@@ -25,7 +25,6 @@'GBP': '£'}[plan.currency]- console.log(plan)return currency + plan.price.net},fetchPlans() {diff --git a/lib/plausible_web/templates/billing/upgrade_enterprise_plan.html.eex b/lib/plausible_web/templates/billing/upgrade_enterprise_plan.html.eexnew file mode 100644index 0000000000..7167f01a17--- /dev/null+++ b/lib/plausible_web/templates/billing/upgrade_enterprise_plan.html.eex@@ -0,0 +1,44 @@+<div class="mx-auto mt-6 text-center">+ <h1 class="text-3xl font-black dark:text-gray-100">Upgrade your free trial</h1>+</div>++<div>+ <div class="flex flex-col w-full max-w-4xl px-4 mx-auto mt-4 md:flex-row">+ <div class="flex-1 px-8 py-4 mt-8 mb-4 bg-white rounded shadow-md dark:bg-gray-800">+ <div class="w-full py-4 dark:text-gray-100">+ <span>You've used <b><%= PlausibleWeb.AuthView.delimit_integer(@usage) %></b> billable pageviews in the last 30 days</span>+ </div>++ <div class="w-full py-4 dark:text-gray-100">+ <span>With this link you can upgrade to an enterprise plan with <b><%= PlausibleWeb.StatsView.large_number_format(@plan[:limit]) %> monthly pageviews</b></span>, billed on a <%= @plan[:cycle] %> basis.+ </div>++ <div class="mt-6 text-left">+ <span class="inline-flex w-full rounded-md shadow-sm">+ <button type="button" data-theme="none" data-product="<%= @plan[:product_id] %>" data-email="<%= @conn.assigns[:current_user].email %>" data-disable-logout="true" data-passthrough="<%= @conn.assigns[:current_user].id %>" data-success="/billing/upgrade-success" class="items-center button paddle_button">+ <svg fill="currentColor" viewBox="0 0 20 20" class="inline w-4 h-4 mr-2"><path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd"></path></svg>+ Pay securely via Paddle+ </button>+ </span>+ </div>+ </div>++ <div class="flex-1 pl-8 pt-14">+ <h3 class="text-lg font-medium text-gray-900 leading-6 dark:text-gray-100">+ What happens if I go over my page views limit?+ </h3>+ <div class="mt-2 text-base text-gray-500 leading-6 dark:text-gray-200">+ You will never be charged extra for an occasional traffic spike. There are no surprise fees and your card will never be charged unexpectedly.<br /><br />+ If your page views exceed your plan for two consecutive months, we will contact you to upgrade to a higher plan for the following month. You will have two weeks to make a decision. You can decide to continue with a higher plan or to cancel your account at that point.+ </div>++ </div>+ </div>+</div>++<div class="mt-8 text-center dark:text-gray-100">+ Questions? Contact <%= link("[email protected]", to: "mailto: [email protected]", class: "text-indigo-500") %>+</div>++<script type="text/javascript" src="https://cdn.paddle.com/paddle/paddle.js"></script>+<script>Paddle.Setup({vendor: 49430})</script>diff --git a/lib/plausible_web/templates/billing/upgrade_to_plan.html.eex b/lib/plausible_web/templates/billing/upgrade_to_plan.html.eexindex 3adcd89023..f0340668ba 100644--- a/lib/plausible_web/templates/billing/upgrade_to_plan.html.eex+++ b/lib/plausible_web/templates/billing/upgrade_to_plan.html.eex@@ -10,12 +10,12 @@</div><div class="w-full py-4 dark:text-gray-100">- <span>With this link you can upgrade to a plan with <b><%= PlausibleWeb.StatsView.large_number_format(@plan[:limit]) %> monthly pageviews</b></span>, billed on a <%= @plan[:cycle] %> basis.+ <span>With this link you can upgrade to an enterprise plan with <b><%= PlausibleWeb.StatsView.large_number_format(@user.enterprise_plan.monthly_pageview_limit) %> monthly pageviews</b></span>, billed on a <%= @user.enterprise_plan.billing_interval %> basis.</div><div class="mt-6 text-left"><span class="inline-flex w-full rounded-md shadow-sm">- <button type="button" data-theme="none" data-product="<%= @plan[:product_id] %>" data-email="<%= @conn.assigns[:current_user].email %>" data-disable-logout="true" data-passthrough="<%= @conn.assigns[:current_user].id %>" data-success="/billing/upgrade-success" class="items-center button paddle_button">+ <button type="button" data-theme="none" data-product="<%= @user.enterprise_plan.paddle_plan_id %>" data-email="<%= @conn.assigns[:current_user].email %>" data-disable-logout="true" data-passthrough="<%= @conn.assigns[:current_user].id %>" data-success="/billing/upgrade-success" class="items-center button paddle_button"><svg fill="currentColor" viewBox="0 0 20 20" class="inline w-4 h-4 mr-2"><path fill-rule="evenodd" d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z" clip-rule="evenodd"></path></svg>Pay securely via Paddle</button>diff --git a/lib/plausible_web/templates/email/enterprise_over_limit.html.eex b/lib/plausible_web/templates/email/enterprise_over_limit.html.eexnew file mode 100644index 0000000000..6fea4741b2--- /dev/null+++ b/lib/plausible_web/templates/email/enterprise_over_limit.html.eex@@ -0,0 +1,8 @@+Automated notice about an account that has gone over their enteprise plan limit.++Customer email: <% @user.email %>+Last billing cycle: <%= date_format(@last_cycle.first) %> to <%= date_format(@last_cycle.last) %>+Usage: <%= PlausibleWeb.StatsView.large_number_format(@usage) %> billable pageviews++--<br />+<%= plausible_url() %><br />diff --git a/lib/workers/check_usage.ex b/lib/workers/check_usage.exindex d6703c8115..a596b86dd3 100644--- a/lib/workers/check_usage.ex+++ b/lib/workers/check_usage.ex@@ -38,31 +38,47 @@ defmodule Plausible.Workers.CheckUsage dofrom u in Plausible.Auth.User,join: s in Plausible.Billing.Subscription,on: s.user_id == u.id,+ left_join: ep in Plausible.Billing.EnterprisePlan,+ on: ep.user_id == u.id,where: s.status == "active",where: not is_nil(s.last_bill_date),# Accounts for situations like last_bill_date==2021-01-31 AND today==2021-03-01. Since February never reaches the 31st day, the account is checked on 2021-03-01.where:least(day_of_month(s.last_bill_date), day_of_month(last_day_of_month(^yesterday))) ==day_of_month(^yesterday),- preload: [subscription: s]+ preload: [subscription: s, enterprise_plan: ep])for subscriber <- active_subscribers doallowance = Plausible.Billing.Plans.allowance(subscriber.subscription){last_last_month, last_month} = billing_mod.last_two_billing_months_usage(subscriber)+ is_over_limit = last_last_month > allowance && last_month > allowance- if last_last_month > allowance && last_month > allowance do- {_, last_cycle} = billing_mod.last_two_billing_cycles(subscriber)- suggested_plan = Plausible.Billing.Plans.suggested_plan(subscriber, last_month)+ cond do+ is_over_limit && subscriber.enterprise_plan ->+ {_, last_cycle} = billing_mod.last_two_billing_cycles(subscriber)- template =- PlausibleWeb.Email.over_limit_email(subscriber, last_month, last_cycle, suggested_plan)+ template =+ PlausibleWeb.Email.enterprise_over_limit_email(subscriber, last_month, last_cycle)- try do- Plausible.Mailer.send_email(template)- rescue- _ -> nil- end+ Plausible.Mailer.send_email_safe(template)++ is_over_limit ->+ {_, last_cycle} = billing_mod.last_two_billing_cycles(subscriber)+ suggested_plan = Plausible.Billing.Plans.suggested_plan(subscriber, last_month)++ template =+ PlausibleWeb.Email.over_limit_email(+ subscriber,+ last_month,+ last_cycle,+ suggested_plan+ )++ Plausible.Mailer.send_email_safe(template)++ true ->+ nilendenddiff --git a/priv/repo/migrations/20211020093238_add_enterprise_plans.exs b/priv/repo/migrations/20211020093238_add_enterprise_plans.exsnew file mode 100644index 0000000000..f6b9e23b40--- /dev/null+++ b/priv/repo/migrations/20211020093238_add_enterprise_plans.exs@@ -0,0 +1,19 @@+defmodule Plausible.Repo.Migrations.AddEnterprisePlans do+ use Ecto.Migration++ def change do+ create_query = "CREATE TYPE billing_interval AS ENUM ('monthly', 'yearly')"+ drop_query = "DROP TYPE billing_interval"+ execute(create_query, drop_query)++ create table(:enterprise_plans) do+ add :user_id, references(:users), null: false, unique: true+ add :paddle_plan_id, :string, null: false+ add :billing_interval, :billing_interval, null: false+ add :monthly_pageview_limit, :integer, null: false+ add :hourly_api_request_limit, :integer, null: false++ timestamps()+ end+ end+enddiff --git a/test/plausible_web/controllers/billing_controller_test.exs b/test/plausible_web/controllers/billing_controller_test.exsindex 61e02d81c6..8c0b408c03 100644--- a/test/plausible_web/controllers/billing_controller_test.exs+++ b/test/plausible_web/controllers/billing_controller_test.exs@@ -2,6 +2,46 @@ defmodule PlausibleWeb.BillingControllerTest douse PlausibleWeb.ConnCaseimport Plausible.TestUtils+ describe "GET /upgrade" do+ setup [:create_user, :log_in]++ test "shows upgrade page when user does not have a subcription already", %{conn: conn} do+ conn = get(conn, "/billing/upgrade")++ assert html_response(conn, 200) =~ "Upgrade your free trial"+ end++ test "redirects user to change plan if they already have a plan", %{conn: conn, user: user} do+ insert(:subscription, user: user)+ conn = get(conn, "/billing/upgrade")++ assert redirected_to(conn) == "/billing/change-plan"+ end++ test "redirects user to enteprise plan page if they are configured with one", %{+ conn: conn,+ user: user+ } do+ plan = insert(:enterprise_plan, user: user)+ conn = get(conn, "/billing/upgrade")++ assert redirected_to(conn) == "/billing/upgrade/enterprise/#{plan.id}"+ end+ end++ describe "GET /upgrade/enterprise/:plan_id" do+ setup [:create_user, :log_in]++ test "renders enteprise plan upgrade page", %{conn: conn, user: user} do+ plan = insert(:enterprise_plan, user: user)++ conn = get(conn, "/billing/upgrade/enterprise/#{plan.id}")++ assert html_response(conn, 200) =~ "Upgrade your free trial"+ assert html_response(conn, 200) =~ "enterprise plan"+ end+ end+describe "GET /change-plan" dosetup [:create_user, :log_in]@@ -17,6 +57,37 @@ defmodule PlausibleWeb.BillingControllerTest doassert redirected_to(conn) == "/billing/upgrade"end++ test "redirects to enterprise change plan page if user has enterprise plan and existing subscription",+ %{conn: conn, user: user} do+ insert(:subscription, user: user)+ plan = insert(:enterprise_plan, user: user)+ conn = get(conn, "/billing/change-plan")++ assert redirected_to(conn) == "/billing/change-plan/enterprise/#{plan.id}"+ end+ end++ describe "GET /change-plan/enterprise/:plan_id" do+ setup [:create_user, :log_in]++ test "shows change plan page if user has subsription and enterprise plan", %{+ conn: conn,+ user: user+ } do+ insert(:subscription, user: user)+ plan = insert(:enterprise_plan, user: user)+ conn = get(conn, "/billing/change-plan/enterprise/#{plan.id}")++ assert html_response(conn, 200) =~ "Change subscription plan"+ end++ test "renders 404 is user does not have enterprise plan", %{conn: conn, user: user} do+ insert(:subscription, user: user)+ conn = get(conn, "/billing/change-plan/enterprise/123")++ assert conn.status == 404+ endenddescribe "POST /change-plan" dodiff --git a/test/support/factory.ex b/test/support/factory.exindex 3e6e11dae2..02727def53 100644--- a/test/support/factory.ex+++ b/test/support/factory.ex@@ -116,6 +116,15 @@ defmodule Plausible.Factory do}end+ def enterprise_plan_factory do+ %Plausible.Billing.EnterprisePlan{+ paddle_plan_id: sequence(:paddle_plan_id, &"plan-#{&1}"),+ billing_interval: :monthly,+ monthly_pageview_limit: 1_000_000,+ hourly_api_request_limit: 3000+ }+ end+def google_auth_factory do%Plausible.Site.GoogleAuth{email: sequence(:google_auth_email, &"email-#{&1}@email.com"),diff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exsindex 4df0daac05..7441f64e8a 100644--- a/test/workers/check_usage_test.exs+++ b/test/workers/check_usage_test.exs@@ -64,7 +64,34 @@ defmodule Plausible.Workers.CheckUsageTest doassert_email_delivered_with(to: [user],- subject: "You have outgrown your Plausible subscription tier "+ subject: "You have outgrown your Plausible subscription tier"+ )+ end++ test "checks usage for enterprise customer, sends usage information to [email protected]",+ %{+ user: user+ } do+ billing_stub =+ Plausible.Billing+ |> stub(:last_two_billing_months_usage, fn _user -> {1_100_000, 1_100_000} end)+ |> stub(:last_two_billing_cycles, fn _user ->+ {Date.range(Timex.today(), Timex.today()), Date.range(Timex.today(), Timex.today())}+ end)++ enterprise_plan = insert(:enterprise_plan, user: user, monthly_pageview_limit: 1_000_000)++ insert(:subscription,+ user: user,+ paddle_plan_id: enterprise_plan.paddle_plan_id,+ last_bill_date: Timex.shift(Timex.today(), days: -1)+ )++ CheckUsage.perform(nil, billing_stub)++ assert_email_delivered_with(+ to: [{nil, "[email protected]"}],+ subject: "#{user.email} has outgrown their enterprise plan")end@@ -89,7 +116,7 @@ defmodule Plausible.Workers.CheckUsageTest doassert_email_delivered_with(to: [user],- subject: "You have outgrown your Plausible subscription tier "+ subject: "You have outgrown your Plausible subscription tier")end@@ -135,7 +162,7 @@ defmodule Plausible.Workers.CheckUsageTest doassert_email_delivered_with(to: [user],- subject: "You have outgrown your Plausible subscription tier "+ subject: "You have outgrown your Plausible subscription tier")endend