From 1e4c0ffe782a048dac727fff0f4465256013c67d Mon Sep 17 00:00:00 2001 From: evazion Date: Sat, 23 Apr 2022 22:49:24 -0500 Subject: [PATCH] users: disable upgrading to platinum. Disable the ability to upgrade to Platinum. The Platinum level still exists, but users can no longer upgrade to it. Sales of Platinum are being disabled in preparation of increasing the tag limit for Gold users. --- app/models/favorite_group.rb | 2 +- app/views/layouts/default.html.erb | 2 +- app/views/static/pagination_error.html.erb | 2 +- app/views/static/search_timeout.html.erb | 5 +-- app/views/static/tag_limit_error.html.erb | 2 +- app/views/user_upgrades/new.html.erb | 46 +++------------------- app/views/users/_secondary_links.html.erb | 4 +- app/views/users/_statistics.html.erb | 2 +- app/views/users/show.html+tooltip.erb | 2 +- 9 files changed, 15 insertions(+), 52 deletions(-) diff --git a/app/models/favorite_group.rb b/app/models/favorite_group.rb index 5a4e5818a..fad59840e 100644 --- a/app/models/favorite_group.rb +++ b/app/models/favorite_group.rb @@ -61,7 +61,7 @@ class FavoriteGroup < ApplicationRecord def creator_can_create_favorite_groups if creator.favorite_groups.count >= creator.favorite_group_limit error = "You can only keep up to #{creator.favorite_group_limit} favorite groups." - if !creator.is_platinum? + if !creator.is_gold? error += " Upgrade your account to create more." end errors.add(:base, error) diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index d6202b4b7..19a3d8b2e 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -131,7 +131,7 @@ <%= link_to "Danbooru Winter Sale", forum_topic_path(Danbooru.config.winter_sale_forum_topic_id) %> ends <%= time_ago_in_words_tagged(Danbooru.config.winter_sale_end_date) %>!
- <%= link_to "Get 25% off Gold & Platinum", new_user_upgrade_path %> + <%= link_to "Get 25% off Gold", new_user_upgrade_path %> (<%= link_to "hide", "#", id: "hide-promotion-notice" %>) diff --git a/app/views/static/pagination_error.html.erb b/app/views/static/pagination_error.html.erb index 9d37d1e91..8b41143e8 100644 --- a/app/views/static/pagination_error.html.erb +++ b/app/views/static/pagination_error.html.erb @@ -5,7 +5,7 @@

<%= @message %> - <% if CurrentUser.is_platinum? %> + <% if CurrentUser.is_gold? %> Try narrowing your search terms. <% else %> Try narrowing your search terms, or <%= link_to "upgrade your account", new_user_upgrade_path %> to go beyond page <%= CurrentUser.user.page_limit %>. diff --git a/app/views/static/search_timeout.html.erb b/app/views/static/search_timeout.html.erb index df45e7eb6..e8c159022 100644 --- a/app/views/static/search_timeout.html.erb +++ b/app/views/static/search_timeout.html.erb @@ -42,9 +42,8 @@

Members are limited to searches that take up to 3 seconds long. You can - <%= link_to "upgrade your account", new_user_upgrade_path %> to increase - your search limit. Gold users can do searches that take up to 6 seconds - long, and Platinum users can go up to 9 seconds. + <%= link_to "upgrade to Gold", new_user_upgrade_path %> to increase + your search limit to 6 seconds long.

<% end %> diff --git a/app/views/static/tag_limit_error.html.erb b/app/views/static/tag_limit_error.html.erb index a700adada..8228f4a57 100644 --- a/app/views/static/tag_limit_error.html.erb +++ b/app/views/static/tag_limit_error.html.erb @@ -5,7 +5,7 @@

<%= @message %> - <% unless CurrentUser.is_platinum? %> + <% unless CurrentUser.is_gold? %> <%= link_to "Upgrade your account", new_user_upgrade_path %> to search for more tags at once. <% end %>

diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb index 6fa496f28..15d889030 100644 --- a/app/views/user_upgrades/new.html.erb +++ b/app/views/user_upgrades/new.html.erb @@ -1,5 +1,5 @@ <% page_title "Account Upgrade" %> -<% meta_description "Upgrade to a Gold or Platinum account." %> +<% meta_description "Upgrade to a Gold account." %> <%= render "users/secondary_links" %> @@ -11,7 +11,9 @@

Gift Account Upgrade

<% if @user_upgrade.recipient.is_platinum? %> -

<%= link_to_user @recipient %> is already above Platinum level and can't be upgraded!

+

<%= link_to_user @recipient %> is already above Gold and can't be upgraded!

+ <% elsif @user_upgrade.recipient.is_gold? %> +

<%= link_to_user @recipient %> is already Gold and can't be upgraded!

<% else %>
You are gifting this upgrade to <%= link_to_user @user_upgrade.recipient %>.
<% end %> @@ -29,7 +31,7 @@ <% if Danbooru.config.is_promotion? %>

<%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %> - Danbooru Winter Sale! Gold and Platinum upgrades are 25% off. Sale ends <%= time_ago_in_words_tagged(Danbooru.config.winter_sale_end_date) %>. + Danbooru Winter Sale! Gold upgrades are 25% off. Sale ends <%= time_ago_in_words_tagged(Danbooru.config.winter_sale_end_date) %>. <%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>

<% end %> @@ -40,14 +42,12 @@ Basic Gold - Platinum - Free @@ -58,74 +58,53 @@ <%= cents_to_usd(UserUpgrade.gold_price) %>
One time fee
- - <% if Danbooru.config.is_promotion? %> - $40 - <% end %> - <%= cents_to_usd(UserUpgrade.platinum_price) %> -
One time fee
- Tag Limit 2 6 - 12 See Hidden Tags No Yes - Yes Page Limit 1,000 2,000 - 5,000 Private Favorites no yes - yes Favorite Groups 3 5 - 10 Saved Searches 250 250 - 1,000 Search Timeout 3 sec 6 sec - 9 sec <% if @user_upgrade.purchaser.is_anonymous? %> <%= link_to "Login", login_path(url: new_user_upgrade_path), class: "login-button button-primary" %> <%= link_to "Get #{Danbooru.config.canonical_app_name} Gold", login_path(url: new_user_upgrade_path), class: "login-button button-primary" %> - <%= link_to "Get #{Danbooru.config.canonical_app_name} Platinum", login_path(url: new_user_upgrade_path), class: "login-button button-primary" %> <% elsif @recipient.level == User::Levels::MEMBER %> <%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", user_upgrades_path(user_id: @recipient.id, upgrade_type: "gold", country: params[:country], promo: params[:promo]), class: "button-primary", remote: true, disable_with: "Redirecting..." %> - <%= button_to "Get #{Danbooru.config.canonical_app_name} Platinum", user_upgrades_path(user_id: @recipient.id, upgrade_type: "platinum", country: params[:country], promo: params[:promo]), class: "button-primary", remote: true, disable_with: "Redirecting..." %> - <% elsif @recipient.level == User::Levels::GOLD %> - - <%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", nil, class: "button-primary", disabled: true %> - <%= button_to "Get #{Danbooru.config.canonical_app_name} Platinum", user_upgrades_path(user_id: @recipient.id, upgrade_type: "gold_to_platinum", country: params[:country], promo: params[:promo]), class: "button-primary", remote: true, disable_with: "Redirecting..." %> <% else %> <%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", nil, class: "button-primary", disabled: true %> - <%= button_to "Get #{Danbooru.config.canonical_app_name} Platinum", nil, class: "button-primary", disabled: true %> <% end %> @@ -143,13 +122,6 @@ results, and also keep more favorite groups and saved searches.

-
- What are the benefits of <%= Danbooru.config.canonical_app_name %> Platinum? - -

Platinum is like Gold, but it lets you search even more tags at once, - and keep even more favorite groups and saved searches.

-
-
What payment methods do you support? @@ -168,14 +140,6 @@ only once and keep the upgrade forever.

-
- If I upgrade to Gold first, can I upgrade to Platinum later? - -

Yes, if you have a Gold account, you can always upgrade to a Platinum - account later. You don't have to pay full price to upgrade from Gold to - Platinum. You only have to pay the difference.

-
-
What is your refund policy? diff --git a/app/views/users/_secondary_links.html.erb b/app/views/users/_secondary_links.html.erb index 98494f888..66580a933 100644 --- a/app/views/users/_secondary_links.html.erb +++ b/app/views/users/_secondary_links.html.erb @@ -13,12 +13,12 @@ <%= subnav_link_to "Settings", settings_path %> <%= subnav_link_to "Messages #{unread_dmail_indicator(CurrentUser.user)}", dmails_path(search: { folder: "received" }) %> - <% if !@user.is_platinum? %> + <% if !@user.is_gold? %> <%= subnav_link_to "Upgrade", new_user_upgrade_path %> <% end %> <% else %> <%= subnav_link_to "Send message", new_dmail_path(:dmail => {:to_id => @user.id}) %> - <% if !@user.is_platinum? %> + <% if !@user.is_gold? %> <%= subnav_link_to "Gift upgrade", new_user_upgrade_path(:user_id => @user.id) %> <% end %> <% end %> diff --git a/app/views/users/_statistics.html.erb b/app/views/users/_statistics.html.erb index 9d1eb3e2c..fe5c813a2 100644 --- a/app/views/users/_statistics.html.erb +++ b/app/views/users/_statistics.html.erb @@ -84,7 +84,7 @@ <%= user.level_string %> - <% if !user.is_platinum? %> + <% if !user.is_gold? %> <% if CurrentUser.user == user %> (<%= link_to "Upgrade account", new_user_upgrade_path %>) <% else %> diff --git a/app/views/users/show.html+tooltip.erb b/app/views/users/show.html+tooltip.erb index 7d67e87e9..0102ff30a 100644 --- a/app/views/users/show.html+tooltip.erb +++ b/app/views/users/show.html+tooltip.erb @@ -52,7 +52,7 @@ <% end %> <% end %> - <% if !@user.is_platinum? %> + <% if !@user.is_gold? %> <% menu.item do %> <%= link_to new_user_upgrade_path(user_id: @user.id) do %> <%= gift_icon %> Gift Upgrade