You've used up your <%= Plan.free.card_limit %> free cards
+<% else %>
+
You've used <%= Current.account.billed_cards_count %> free cards out of <%= Plan.free.card_limit %>
+<% end %>
+
+
If you'd like to keep using Fizzy past <%= Plan.free.card_limit %> cards, it's only $<%= Plan.paid.price %>/month for unlimited cards + unlimited users. You'll also get <%= storage_to_human_size(Plan.paid.storage_limit) %> of storage.
Cancel anytime, no contracts, take your data with you whenever.
+
Right now you're on the <%= Current.account.plan.name %> plan which includes <%= Plan.free.card_limit %> cards, unlimited users, and <%= storage_to_human_size(Plan.free.storage_limit) %> of storage.
diff --git a/app/views/account/settings/_paid_plan.html.erb b/app/views/account/settings/_paid_plan.html.erb
new file mode 100644
index 0000000..c49af10
--- /dev/null
+++ b/app/views/account/settings/_paid_plan.html.erb
@@ -0,0 +1,6 @@
+
Right now you're on the <%= Current.account.plan.name %> plan which includes unlimited cards, unlimited users, and <%= storage_to_human_size(Plan.paid.storage_limit) %> of storage.
+<% end %>
diff --git a/app/views/account/settings/_subscription_panel.html.erb b/app/views/account/settings/_subscription_panel.html.erb
index 44949e0..5a5f0ea 100644
--- a/app/views/account/settings/_subscription_panel.html.erb
+++ b/app/views/account/settings/_subscription_panel.html.erb
@@ -3,26 +3,9 @@
Subscription
<% if Current.account.plan.free? %>
- <% if Current.account.exceeding_card_limit? %>
-
You’ve used up your <%= Plan.free.card_limit %> free cards
- <% else %>
-
You’ve used <%= Current.account.billed_cards_count %> free cards out of <%= Plan.free.card_limit %>
- <% end %>
-
-
If you’d like to keep using Fizzy past <%= Plan.free.card_limit %> cards, it’s only $<%= Plan.paid.price %>/month for unlimited cards + unlimited users. You'll also get <%= plan_storage_limit(Plan.paid) %> of storage.
Cancel anytime, no contracts, take your data with you whenever.
-
Right now you’re on the <%= Current.account.plan.name %> plan which includes <%= Plan.free.card_limit %> cards, unlimited users, and <%= plan_storage_limit(Plan.free) %> of storage.
Right now you’re on the <%= Current.account.plan.name %> plan which includes unlimited cards, unlimited users, and <%= plan_storage_limit(Plan.paid) %> of storage.
- <% end %>
+ <%= render "account/settings/paid_plan" %>
<% end %>
-
<% end %>
diff --git a/app/views/account/subscriptions/_upgrade.html.erb b/app/views/account/subscriptions/_upgrade.html.erb
index d1c06e7..449fecf 100644
--- a/app/views/account/subscriptions/_upgrade.html.erb
+++ b/app/views/account/subscriptions/_upgrade.html.erb
@@ -1,12 +1,9 @@
<% if Current.user.admin? %>
- You’ve used your <%= Plan.free.card_limit %> free cards.
- <%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
- Upgrade to Unlimited
- <% end %>
+ <%= render "account/subscriptions/notices/admin_exceeding_card_limit" if Current.account.exceeding_card_limit? %>
+ <%= render "account/subscriptions/notices/admin_exceeding_storage_limit" if Current.account.exceeding_storage_limit? %>
<% else %>
-
- This account has used <%= Plan.free.card_limit %> free cards. Upgrade to get more.
-
+ <%= render "account/subscriptions/notices/user_exceeding_card_limit" if Current.account.exceeding_card_limit? %>
+ <%= render "account/subscriptions/notices/user_exceeding_storage_limit" if Current.account.exceeding_storage_limit? %>
<% end %>
diff --git a/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb b/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb
new file mode 100644
index 0000000..e6c714e
--- /dev/null
+++ b/app/views/account/subscriptions/notices/_admin_exceeding_card_limit.html.erb
@@ -0,0 +1,4 @@
+You've used your <%= Plan.free.card_limit %> free cards.
+<%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
+ Upgrade to Unlimited
+<% end %>
diff --git a/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb b/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb
new file mode 100644
index 0000000..9f7c6c3
--- /dev/null
+++ b/app/views/account/subscriptions/notices/_admin_exceeding_storage_limit.html.erb
@@ -0,0 +1,4 @@
+You've used your <%= storage_to_human_size(Plan.free.storage_limit) %> free storage.
+<%= link_to account_settings_path(anchor: "subscription"), class: "btn settings-subscription__button" do %>
+ Upgrade for more storage
+<% end %>
diff --git a/app/views/account/subscriptions/notices/_user_exceeding_card_limit.html.erb b/app/views/account/subscriptions/notices/_user_exceeding_card_limit.html.erb
new file mode 100644
index 0000000..f3f65f3
--- /dev/null
+++ b/app/views/account/subscriptions/notices/_user_exceeding_card_limit.html.erb
@@ -0,0 +1,3 @@
+
+ This account has used <%= Plan.free.card_limit %> free cards. Upgrade to get more.
+
diff --git a/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb b/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb
new file mode 100644
index 0000000..51d4a5c
--- /dev/null
+++ b/app/views/account/subscriptions/notices/_user_exceeding_storage_limit.html.erb
@@ -0,0 +1,3 @@
+
+ This account has used <%= storage_to_human_size(Plan.free.storage_limit) %> free storage. Upgrade to get more.
+
- <% if Current.user.admin? %>
- You’ve used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <%= link_to "Upgrade to unlimited", account_settings_path(anchor: "subscription") %>.
- <% else %>
- This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. Upgrade soon
- <% end %>
-
-<% end %>
+
+ <% if Current.user.admin? %>
+ <%= render "cards/container/footer/saas/notices/admin_nearing_card_limit" if Current.account.nearing_plan_cards_limit? %>
+ <%= render "cards/container/footer/saas/notices/admin_nearing_storage_limit" if Current.account.nearing_plan_storage_limit? %>
+ <% else %>
+ <%= render "cards/container/footer/saas/notices/user_nearing_card_limit" if Current.account.nearing_plan_cards_limit? %>
+ <%= render "cards/container/footer/saas/notices/user_nearing_storage_limit" if Current.account.nearing_plan_storage_limit? %>
+ <% end %>
+
diff --git a/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb b/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb
new file mode 100644
index 0000000..1b303e6
--- /dev/null
+++ b/app/views/cards/container/footer/saas/notices/_admin_nearing_card_limit.html.erb
@@ -0,0 +1 @@
+You've used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. <%= link_to "Upgrade to unlimited", account_settings_path(anchor: "subscription") %>.
diff --git a/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb b/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb
new file mode 100644
index 0000000..904d296
--- /dev/null
+++ b/app/views/cards/container/footer/saas/notices/_admin_nearing_storage_limit.html.erb
@@ -0,0 +1 @@
+You've used <%= storage_to_human_size(Current.account.billed_bytes_used) %> out of <%= storage_to_human_size(Plan.free.storage_limit) %> free storage. <%= link_to "Upgrade for more", account_settings_path(anchor: "subscription") %>.
diff --git a/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb b/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb
new file mode 100644
index 0000000..30f7b5f
--- /dev/null
+++ b/app/views/cards/container/footer/saas/notices/_user_nearing_card_limit.html.erb
@@ -0,0 +1 @@
+This account has used <%= Current.account.billed_cards_count %> out of <%= Plan.free.card_limit %> free cards. Upgrade soon
diff --git a/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb b/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb
new file mode 100644
index 0000000..c9df3e8
--- /dev/null
+++ b/app/views/cards/container/footer/saas/notices/_user_nearing_storage_limit.html.erb
@@ -0,0 +1 @@
+This account has used <%= storage_to_human_size(Current.account.billed_bytes_used) %> out of <%= storage_to_human_size(Plan.free.storage_limit) %> free storage. Upgrade soon
diff --git a/db/migrate/20251216000000_add_bytes_used_to_account_overridden_limits.rb b/db/migrate/20251216000000_add_bytes_used_to_account_overridden_limits.rb
new file mode 100644
index 0000000..85adad4
--- /dev/null
+++ b/db/migrate/20251216000000_add_bytes_used_to_account_overridden_limits.rb
@@ -0,0 +1,5 @@
+class AddBytesUsedToAccountOverriddenLimits < ActiveRecord::Migration[8.2]
+ def change
+ add_column :account_overridden_limits, :bytes_used, :bigint
+ end
+end
diff --git a/db/saas_schema.rb b/db/saas_schema.rb
index 59c78f4..7e9b80b 100644
--- a/db/saas_schema.rb
+++ b/db/saas_schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.2].define(version: 2025_12_15_170000) do
+ActiveRecord::Schema[8.2].define(version: 2025_12_16_000000) do
create_table "account_billing_waivers", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.uuid "account_id", null: false
t.datetime "created_at", null: false
@@ -20,6 +20,7 @@
create_table "account_overridden_limits", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.uuid "account_id", null: false
+ t.bigint "bytes_used"
t.integer "card_count"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
diff --git a/exe/stripe-dev b/exe/stripe-dev
index 2033385..5f4820c 100755
--- a/exe/stripe-dev
+++ b/exe/stripe-dev
@@ -30,13 +30,15 @@ secrets_escaped = `kamal secrets fetch \
--account basecamp \
--from "Deploy/Fizzy" \
"Development/STRIPE_SECRET_KEY" \
- "Development/STRIPE_MONTHLY_V1_PRICE_ID" 2>/dev/null`
+ "Development/STRIPE_MONTHLY_V1_PRICE_ID" \
+ "Development/STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID" 2>/dev/null`
secrets_json = secrets_escaped.gsub(/\\(.)/, '\1')
secrets = JSON.parse(secrets_json)
stripe_secret_key = secrets["Deploy/Fizzy/Development/STRIPE_SECRET_KEY"]
stripe_price_id = secrets["Deploy/Fizzy/Development/STRIPE_MONTHLY_V1_PRICE_ID"]
+stripe_extra_storage_price_id = secrets["Deploy/Fizzy/Development/STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID"]
# Clear previous log file
File.write(LOG_FILE, "")
@@ -72,6 +74,7 @@ end
# Output export statements
puts %Q(export STRIPE_SECRET_KEY="#{stripe_secret_key}")
puts %Q(export STRIPE_MONTHLY_V1_PRICE_ID="#{stripe_price_id}")
+puts %Q(export STRIPE_MONTHLY_EXTRA_STORAGE_V1_PRICE_ID="#{stripe_extra_storage_price_id}")
puts %Q(export STRIPE_WEBHOOK_SECRET="#{webhook_secret}") if webhook_secret
# Informational message to stderr (won't be eval'd)
diff --git a/test/controllers/accounts/subscriptions_controller_test.rb b/test/controllers/accounts/subscriptions_controller_test.rb
index d98ac1d..7a02b20 100644
--- a/test/controllers/accounts/subscriptions_controller_test.rb
+++ b/test/controllers/accounts/subscriptions_controller_test.rb
@@ -37,6 +37,21 @@ class Account::SubscriptionsControllerTest < ActionDispatch::IntegrationTest
assert_redirected_to "https://checkout.stripe.com/session123"
end
+ test "create with plan_key uses specified plan" do
+ customer = OpenStruct.new(id: "cus_test_37signals")
+ session = OpenStruct.new(url: "https://checkout.stripe.com/session123")
+
+ Stripe::Customer.stubs(:retrieve).returns(customer)
+ Stripe::Checkout::Session.stubs(:create).with do |options|
+ options[:metadata][:plan_key] == :monthly_extra_storage_v1 &&
+ options[:line_items].first[:price] == Plan.paid_with_extra_storage.stripe_price_id
+ end.returns(session)
+
+ post account_subscription_path(plan_key: :monthly_extra_storage_v1)
+
+ assert_redirected_to "https://checkout.stripe.com/session123"
+ end
+
test "create requires admin" do
logout_and_sign_in_as :david
diff --git a/test/models/account/limited_test.rb b/test/models/account/limited_test.rb
index 335d6a3..a7e82ad 100644
--- a/test/models/account/limited_test.rb
+++ b/test/models/account/limited_test.rb
@@ -32,7 +32,31 @@ class Account::LimitedTest < ActiveSupport::TestCase
assert accounts(:initech).exceeding_card_limit?
end
- test "override limits" do
+ test "detect nearing storage limit" do
+ account = accounts(:initech)
+
+ # Not near limit (more than 500MB remaining of 1GB)
+ account.override_limits bytes_used: 524.megabytes
+ assert_not account.nearing_plan_storage_limit?
+
+ # Near limit (less than 500MB remaining of 1GB)
+ account.override_limits bytes_used: 525.megabytes
+ assert account.nearing_plan_storage_limit?
+ end
+
+ test "detect exceeding storage limit" do
+ account = accounts(:initech)
+
+ # Under limit
+ account.override_limits bytes_used: 1.gigabyte - 1
+ assert_not account.exceeding_storage_limit?
+
+ # Over limit
+ account.override_limits bytes_used: 1.gigabyte + 1
+ assert account.exceeding_storage_limit?
+ end
+
+ test "override cards count" do
account = accounts(:initech)
account.update_column(:cards_count, 1001)
@@ -49,6 +73,20 @@ class Account::LimitedTest < ActiveSupport::TestCase
assert_equal 1001, account.billed_cards_count
end
+ test "override bytes used" do
+ account = accounts(:initech)
+ actual_bytes = account.bytes_used
+
+ assert_equal actual_bytes, account.billed_bytes_used
+
+ account.override_limits bytes_used: 10_000
+ assert_equal 10_000, account.billed_bytes_used
+ assert_equal actual_bytes, account.bytes_used # original unchanged
+
+ account.reset_overridden_limits
+ assert_equal actual_bytes, account.billed_bytes_used
+ end
+
test "comped accounts are never limited" do
account = accounts(:initech)
account.update_column(:cards_count, 1_000_000)