diff --git a/saas/app/helpers/subscriptions_helper.rb b/saas/app/helpers/subscriptions_helper.rb index 2c05b68eb..a1c4c07d9 100644 --- a/saas/app/helpers/subscriptions_helper.rb +++ b/saas/app/helpers/subscriptions_helper.rb @@ -1,4 +1,8 @@ module SubscriptionsHelper + def plan_storage_limit(plan) + number_to_human_size(plan.storage_limit).delete(" ") + end + def subscription_period_end_action(subscription) if subscription.to_be_canceled? "Your Fizzy subscription ends on" diff --git a/saas/app/models/plan.rb b/saas/app/models/plan.rb index 835e94472..7ef7f922e 100644 --- a/saas/app/models/plan.rb +++ b/saas/app/models/plan.rb @@ -47,8 +47,4 @@ class Plan def limit_cards? card_limit != Float::INFINITY end - - def formatted_storage_limit - ActionController::Base.helpers.number_to_human_size(storage_limit).delete(" ") - end end diff --git a/saas/app/views/account/settings/_subscription_panel.html.erb b/saas/app/views/account/settings/_subscription_panel.html.erb index 55fc2f63f..44949e022 100644 --- a/saas/app/views/account/settings/_subscription_panel.html.erb +++ b/saas/app/views/account/settings/_subscription_panel.html.erb @@ -9,18 +9,18 @@

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 <%= number_to_human_size(Plan.paid.formatted_storage_limit) %> of storage.

+

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.

<%= button_to "Upgrade to #{Plan.paid.name} for $#{ Plan.paid.price }/month", account_subscription_path, class: "btn settings-subscription__button txt-medium", form: { data: { turbo: false } } %>

Cancel anytime, no contracts, take your data with you whenever.

- + <% else %>

Thank you for buying Fizzy

<% if Current.account.subscription %> <%= render "account/settings/subscription", subscription: Current.account.subscription %> - + <% end %> <% end %>