effective_memberships 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612909b87d53748d9b3488893e419cf6f8bdcb852fdb07d3bd0f015bda89771c
-  data.tar.gz: 7c48d16e502036542d4f80e785986134e19466593b44ecce9cef151e76387acc
+  metadata.gz: 4bc5657a2097391cfb805df2692268a14cbd4ed48e11e131cf60557fdf0cffde
+  data.tar.gz: 377b12d152f9c31f6470583782b79279d3c5f77a2fe9e60e10d559a4cf5e0dab
 SHA512:
-  metadata.gz: 835021e63b547f68e17ae9bd9ca6bbc523217e1f4f7c3eaf100696ef4456fb63b4f384765cad26db941aca67203ddb87e157ac64620e41220f98571a23d9074b
-  data.tar.gz: 706ec5a09d03a23f5495ccae6ec1f28fb930a4a1533a41b15f6f9a859f6e1bbb1d19dd9df0f83e0e6a56fb0bd6abe6d378576e5d1d439a2fa9ebaa3adfec2d69
+  metadata.gz: 8271a9201d637efa7feecd01e5d1b882cab60c66417286479ff45a068831e1ef2477f5814de7e13def8613476793ab422b047c76733a60e3d50af559da79637f
+  data.tar.gz: c153829d44825f2122f9b2cfdb034012545cb55d7fff63186ca75330d9d6b493625770b17b4efcea8ec7b459baaffa814f77c7f23df07f5b4cb93b97fc4d6db8

data/app/models/concerns/effective_memberships_applicant.rb

@@ -190,7 +190,7 @@ module EffectiveMembershipsApplicant
 
     scope :not_draft, -> { where.not(status: :draft) }
 
-    scope :reviewable, -> { where.not(status: [:draft, :declined, :approved]) }
+    scope :reviewable, -> { where.not(status: [:draft, :submitted, :declined, :approved]) }
 
     scope :for, -> (user) {
       raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
@@ -624,12 +624,12 @@ module EffectiveMembershipsApplicant
       return categories.where(can_apply_new: true)
     end
 
-    category_ids = user.membership.category_ids
+    category_ids = user.membership.category_ids.map(&:to_s) - [nil, '']
 
-    categories.select do |cat|
-      cat.can_apply_new? ||
-      cat.can_apply_existing? ||
-      (cat.can_apply_restricted? && (category_ids & cat.can_apply_restricted_ids).present?)
+    categories.select do |category|
+      category.can_apply_new? ||
+      category.can_apply_existing? ||
+      (category.can_apply_restricted? && (category_ids & category.can_apply_restricted_ids).present?)
     end
   end
 

data/app/views/effective/memberships/_dashboard.html.haml

@@ -25,7 +25,7 @@
   - if membership.number.present?
     %p Your membership number is ##{membership.number} and you joined on #{membership.joined_on.strftime('%F')}.
   - else
-    %p You joined on #{membership.joined_on.strftime('%F')} and have not been assigned a membership number.
+    %p You joined on #{membership.joined_on.strftime('%F')}.
 
   - if membership.registration_on > membership.joined_on
     %p Your last category or status change was on #{membership.registration_on.strftime('%F')}.

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.8'
+  VERSION = '0.9.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails