fix(subscription): not being active when creating and apply scope to …

…user
debtcollective · Oct 14, 2019 · 7326544 · 7326544
1 parent 7fb71a2
commit 7326544
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/subscription_charges_controller.rb b/app/controllers/subscription_charges_controller.rb
@@ -34,6 +34,7 @@ def create
     )
 
     if charge
+      @subscription.active = true
       @subscription.last_charge_at = DateTime.now
       @subscription.save
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -5,7 +5,7 @@ class User < ApplicationRecord
 
   SSO_ATTRIBUTES = %w[admin avatar_url banned custom_fields email name username].freeze
 
-  has_one :subscription
+  has_one :subscription, -> { where active: true }
   has_many :cards
   has_many :donations