Merge branch 'hotfix/0.2.19_fix.3'

* hotfix/0.2.19_fix.3: fix member scopes
ulmic · Jun 26, 2015 · 9ac1948 · 9ac1948
2 parents d149c69 + a7b3d8f
commit 9ac1948
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/scopes/member_scopes.rb b/app/scopes/member_scopes.rb
@@ -4,10 +4,10 @@ module MemberScopes
 
   included do
     scope :presented, -> { where('member_state != \'removed\' AND member_state != \'not_member\'').order('ticket ASC') }
-    scope :confirmed, -> { where(member_state: :confirmed).where.not(ticket: nil).order('ticket DESC') }
-    scope :declined, -> { where(member_state: :declined).order('ticket DESC') }
+    scope :confirmed, -> { where(member_state: :confirmed).where.not(ticket: nil, state: :unavailable).order('ticket DESC') }
+    scope :declined, -> { where(member_state: :declined).where.not(state: :unavailable).order('ticket DESC') }
     scope :removed, -> { where(member_state: :removed).order('ticket DESC') }
-    scope :unviewed, -> { where(member_state: :unviewed, type: 'Member').order('id ASC') }
+    scope :unviewed, -> { where(member_state: :unviewed, type: 'Member').where.not(state: :unavailable).order('id ASC') }
     scope :unavailable, -> { where(state: :unavailable).order('ticket ASC') }
   end
 end