fix: verification of active subscription

debtcollective · Oct 15, 2019 · 3f44ba0 · 3f44ba0
1 parent 6c1e492
commit 3f44ba0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
@@ -3,6 +3,7 @@
 class StaticPagesController < ApplicationController
   def home
     @current_user = current_user
+    @current_user_subscription = @current_user.active_subscription
     @plans = Plan.all.order('amount asc')
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -40,6 +40,6 @@ def current_streak
   end
 
   def active_subscription
-    subscriptions.active
+    subscriptions.active unless subscriptions.active.blank?
   end
 end
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -39,7 +39,7 @@
           </h3>
           <h4><%= plan.headline %></h4>
           <%= plan.description %>
-          <% if @current_user&.active_subscription&.plan.id == plan.id %>
+          <% if @current_user_subscription&.plan&.id == plan.id %>
             <p>Subscribed</p>
           <% else %>
             <p><%= link_to 'Subscribe', @current_user ? new_subscription_charge_path(plan_id: plan) : login_path  %></p>