effective_memberships 0.9.13 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9433add3d7d0b17df72da4ff6041b5667d2d57361b58d1f0a33e6c58e9a75ed
-  data.tar.gz: 68b962790a39557618f6b3f43bf79ad1d9416631b5bf7a48eba8296d68f9afc2
+  metadata.gz: e299db8cf3241529169d0f61a9524263dce1b1752fb04cbec395951ae7d1d029
+  data.tar.gz: e04637274efa4c3bffae73bbd27b62588ec3f6c74379050f51c58609f513bbc0
 SHA512:
-  metadata.gz: 79784d64235015655ef74cb86025ea250b97984984b307508f7897d9800b48fae553fdcb7815d00a8332160ec2bd4d41667c89707ee1bd81871d181b3c5d8f29
-  data.tar.gz: 8d2063383c55489ab29f5a2f2532c2086f0827affae2d52cb5e29a973ea1e26f21125cdb61a5b7c344a4b9896cb65151520239e6a7287bcff5bc32d86edd2dfa
+  metadata.gz: 9d01059e8b8e98c6c5ed0838a15a4b126a6d031cbaea7f76adb19146985f687514f5d518ca05bebbf6b9b3735739efd26c63a5d3a970097572d836cadb478c01
+  data.tar.gz: 00da75ee33edb063d76280cfb6bd1c771903ff24bdab9db0bf5c0ca06cc76e0998bd72313705ae0bf2ef90acf0c37dc4703b9fc5b3d15b34808f13606ccf38bc

data/app/models/concerns/effective_memberships_applicant.rb

@@ -607,7 +607,7 @@ module EffectiveMembershipsApplicant
   def can_apply_applicant_types_collection
     if owner.blank?
       ['Apply to Join']
-    elsif owner.membership_removed?
+    elsif owner.membership_removed? && owner.reinstatement_membership_history.present?
       ['Apply for Reinstatement', 'Apply to Join']
     elsif owner.membership.blank? || owner.membership.categories.blank?
       ['Apply to Join']

data/app/models/concerns/effective_memberships_owner.rb

@@ -144,11 +144,11 @@ module EffectiveMembershipsOwner
   end
 
   def reinstatement_membership_category
-    reinstatement_membership_history.membership_categories.first if membership_removed?
+    reinstatement_membership_history&.membership_categories&.first
   end
 
   def reinstatement_membership_statuses
-    reinstatement_membership_history.membership_statuses if membership_removed?
+    reinstatement_membership_history&.membership_statuses
   end
 
   def registrar_action_categories(action)

data/app/models/concerns/effective_memberships_registrar.rb

@@ -202,15 +202,14 @@ module EffectiveMembershipsRegistrar
 
   def reinstate!(owner, to: nil, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('owner must have a removed membership.') unless owner.membership_removed?
 
-    history = owner.reinstatement_membership_history
-    raise('owner must have a reinstatement membership history.') if history.blank?
+    history = owner.reinstatement_membership_history || owner.membership_histories.last
+    raise('owner must have a removed membership history or some kind of history.') if history.blank?
 
     to ||= owner.reinstatement_membership_category
     raise('expecting a to memberships category') unless to.class.respond_to?(:effective_memberships_category?)
 
-    statuses = owner.reinstatement_membership_statuses
+    statuses = Array(owner.reinstatement_membership_statuses)
 
     # Default Date
     date ||= Time.zone.now

data/app/views/admin/applicants/_form_approve.html.haml

@@ -9,7 +9,7 @@
   %p
     - if applicant.owner.membership&.number_was.present?
       The member will keep their existing membership number: #{applicant.owner.membership.number}.
-    - elsif applicant.reinstatement? && reinstatement.number.present?
+    - elsif applicant.reinstatement? && reinstatement&.number.present?
       The member will keep their previous membership number: #{reinstatement.number}.
     - else
       - number = EffectiveMemberships.Registrar.next_membership_number(applicant.owner, to: applicant.category)
@@ -19,7 +19,7 @@
       - else
         No membership number will be assigned.
 
-  - if applicant.reinstatement?
+  - if applicant.reinstatement? && reinstatement.present?
     %p The member will be reinstated with their previous status: #{badges(reinstatement.membership_statuses) || 'None'}.
 
   %h3 Fees

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

@@ -35,6 +35,8 @@
 
 - if current_user.membership_removed?
   %p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.
+
+- if current_user.reinstatement_membership_history.present?
   %p You may Apply for Reinstatement to #{current_user.reinstatement_membership_category} by clicking the Apply to Join button below and then complete the wizard.
 
 - if membership_organizations.present?

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.13'
+  VERSION = '0.9.15'
 end

metadata

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