jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrades: fix Danbooru.config.user_upgrades_enabled? setting

Browse Source 
* Fix it so that if upgrades are disabled, only the payment button is disabled instead of the whole page.
* Fix it so that disabling upgrades with DANBOORU_USER_UPGRADES_ENABLED="false" works.
This commit is contained in:
evazion
2022-05-17 01:19:20 -05:00
parent 3dbe6ea842
commit 8239a1b551
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user_upgrade.rb
View File

@@ -28,7 +28,7 @@ class UserUpgrade < ApplicationRecord
scope :self_upgrade, -> { where("recipient_id = purchaser_id") } scope :self_upgrade, -> { where("recipient_id = purchaser_id") }
def self.enabled? def self.enabled?
Danbooru.config.user_upgrades_enabled? Danbooru.config.user_upgrades_enabled?.to_s.truthy?
end end
def self.gold_price def self.gold_price

2
app/policies/user_upgrade_policy.rb
View File

@@ -6,7 +6,7 @@ class UserUpgradePolicy < ApplicationPolicy
end end
def new? def new?
UserUpgrade.enabled? true
end end
def show? def show?

4
app/views/user_upgrades/new.html.erb
View File

@@ -107,7 +107,9 @@
<% end %> <% end %>
</td> </td>
<td> <td>
<% if @user_upgrade.purchaser.is_anonymous? %> <% if !UserUpgrade.enabled? %>
<%= button_to "Get #{Danbooru.config.canonical_app_name} Gold", user_upgrades_path(user_id: @recipient.id), class: "button-primary", disabled: true %>
<% elsif @user_upgrade.purchaser.is_anonymous? %>
<%= link_to "Get #{Danbooru.config.canonical_app_name} Gold", new_user_path(url: new_user_upgrade_path), class: "button-primary" %> <%= link_to "Get #{Danbooru.config.canonical_app_name} Gold", new_user_path(url: new_user_upgrade_path), class: "button-primary" %>
<% elsif @user_upgrade.recipient.level <= User::Levels::MEMBER %> <% elsif @user_upgrade.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], payment_processor: "authorize_net"), class: "button-primary", remote: true, disable_with: "Redirecting..." %> <%= 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], payment_processor: "authorize_net"), class: "button-primary", remote: true, disable_with: "Redirecting..." %>