effective_memberships 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994cc88bc7e75f8660b8af1a9930175493759241323675edc72da9ab53640ab5
-  data.tar.gz: e29658115f728da1b3b33f5776fc24e461f6abe5ac9cb8d1362834153598a96e
+  metadata.gz: b1fcdc5cbf08b23f6aab670babdf698a2aff6b6d9d2067055dc970bb2eb4b8e4
+  data.tar.gz: 0a423a28dc16bd84135e741bcb9f290c7997c034ba0095319bab4cf36913d605
 SHA512:
-  metadata.gz: 9b2a8938998de7838aef913e2e4f2262a0cde28fc04de5fb0d74816a1ff9ddc23db3000985aceca51b4578339553c9be2c39b0ca0df11c6bbecd7a620101e17f
-  data.tar.gz: 95f6268d44cc10e4dabe9c4208f5d42ae669533f31876643aa2b31749414dc5cbf68e8368c062c5997cc61261579e6bec5decfb446020c5497fe74cc02a29640
+  metadata.gz: 296aa3d82c05315ac9247f28052e474440562fb85450fc4735f4875b26d67ccdd612df58727207251f2540f103efa41c519128e1366be02f446400816000f3de
+  data.tar.gz: 71feca7c490aea3f2ba49cae7c3318b79d5da533f1b7a6adedcb0ae38a1b9ea2c6b61daa163a9abfc92e2d3e8aff110dbb705c4e373bcfab488aae1d9533a82c

data/app/models/concerns/effective_memberships_applicant.rb

@@ -194,8 +194,14 @@ module EffectiveMembershipsApplicant
     # Set Apply to Join or Reclassification
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
       self.applicant_type ||= can_apply_applicant_types_collection().first
-      self.from_category = owner.membership&.category
-      self.from_status = owner.membership&.status if reinstatement?
+
+      if owner.membership.present?
+        self.from_category = owner.membership.categories.first
+      end
+
+      if owner.membership.present? && reinstatement?
+        self.from_status = owner.membership.statuses.find { |status| status.reinstatable? }
+      end
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -779,7 +785,7 @@ module EffectiveMembershipsApplicant
     elsif reclassification?
       EffectiveMemberships.Registrar.reclassify!(owner, to: category)
     elsif reinstatement?
-      EffectiveMemberships.Registrar.reinstate!(owner)
+      EffectiveMemberships.Registrar.reinstate!(owner, from: from_status)
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -186,17 +186,18 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def reinstate!(owner, date: nil, skip_fees: false)
+  def reinstate!(owner, from:, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
-    from = owner.membership.status
-    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
+    raise('expecting a from') if from.blank?
+    raise('expected a from status or category') unless from.class.respond_to?(:effective_memberships_status?) || from.class.respond_to?(:effective_memberships_category?)
 
     date ||= Time.zone.now
 
     membership = owner.membership
-    membership.membership_status(status: from).mark_for_destruction if from.present?
+    membership.membership_status(status: from).mark_for_destruction if from.class.respond_to?(:effective_memberships_status?)
+    membership.membership_category(category: from).mark_for_destruction if from.class.respond_to?(:effective_memberships_category?)
 
     unless skip_fees
       fee = owner.build_prorated_fee(date: date)

data/app/views/effective/applicants/_summary.html.haml

@@ -22,7 +22,11 @@
           - else
             None
 
-    - if applicant.from_category.present?
+    - if applicant.from_status.present?
+      %tr
+        %th From Status
+        %td= applicant.from_status
+    - elsif applicant.from_category.present?
       %tr
         %th From Category
         %td= applicant.from_category

data/app/views/effective/applicants/select/_apply_for_reinstatement.html.haml

@@ -1,3 +1,3 @@
 - membership = f.object.owner.membership
 
-%p Apply for reinstatement from #{membership.status || membership.category}.
+%p Apply for reinstatement from #{badges(f.object.from_status || f.object.from_category)}.

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Code and Effect