effective_memberships 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e719afd32d55f610b718c370497cceb43760450cfca029e618efc99dd73a8d28
-  data.tar.gz: 4564cce2a02072ad8db4c81b4c7507b522a4a1a03683899797d9c2d8aa1f89b5
+  metadata.gz: 20013e5735497e62dd4c8224ef8fe0a97f9cc12d285871541cea4ceaefa13796
+  data.tar.gz: 0b652f51e8b7ac62c99c11b7a6a5fe6961e8b79a579048aaa7e06b8ad5dca204
 SHA512:
-  metadata.gz: 0d711bedd67af762919f71c2d52a3848c70c14af8e756cab24018a4b45d616f92f42510329f53c2e5f886bfceb248e522a9d87f62a89f24641add4b208f8d0c8
-  data.tar.gz: 0f11ce742fc500785d1203c87fe3dae05d855deb4f7a51953de4a6efe3e1dff4dc12b06f72631da580cdda039552265abcf2d3c94bdc0291fb787e76c69773c8
+  metadata.gz: bde5324d4cadb8f64caca5fa6cc8eb0910015514df5bcad58170a78be4e27e736fcbd1d306b3fa19f919a49183d4a0e940b82b17d2f7401d6d87927b5c9a36b6
+  data.tar.gz: b3cd7c41dc00b22804ab6e8df8904807b0099758ce479807f682e2686cd5c64362fd0be534af0181868a29f8c2935e4f7dd7c72d6b1d2f3e56f78ebcc543d2c2

data/app/datatables/effective_applicant_endorsers_datatable.rb

@@ -0,0 +1,20 @@
+# For the Endorser's dashboard to display endorsements to complete
+class EffectiveApplicantEndorsersDatatable < Effective::Datatable
+
+  datatable do
+    length :all
+
+    col :created_at
+    col :applicant
+
+    actions_col do |applicant_endorsement|
+      dropdown_link_to 'Show', effective_memberships.applicant_endorsement_path(applicant_endorsement)
+    end
+
+  end
+
+  collection do
+    Effective::ApplicantEndorsement.deep.needs_endorser.where(endorser: current_user)
+  end
+
+end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -22,7 +22,7 @@ module EffectiveMembershipsApplicant
     end
 
     def categories
-      ['Apply to Join', 'Apply to Reclassify']
+      ['Apply to Join', 'Apply to Reclassify', 'Apply for Reinstatement']
     end
 
     def transcripts_statuses
@@ -51,6 +51,7 @@ module EffectiveMembershipsApplicant
       select: 'Select Application Type',
       demographics: 'Demographics',         # Individual only. Users fields.
       organization: 'Organization',         # Organization only. Organization fields.
+      reinstatement: 'Reinstatement',       # Apply for Reinstatement only
       education: 'Education',
       course_amounts: 'Courses',
       equivalences: 'Equivalent Memberships',
@@ -80,6 +81,9 @@ module EffectiveMembershipsApplicant
     attr_accessor :declare_code_of_ethics
     attr_accessor :declare_truth
 
+    # Reinstatements Step
+    attr_accessor :declare_reinstatement
+
     # Admin Approve Step
     attr_accessor :approved_membership_number
     attr_accessor :approved_membership_date
@@ -93,7 +97,10 @@ module EffectiveMembershipsApplicant
 
     belongs_to :category, polymorphic: true, optional: true
 
+    # Required for Apply to Reclassify
     belongs_to :from_category, polymorphic: true, optional: true
+
+    # Required for Apply for Reinstatement
     belongs_to :from_status, polymorphic: true, optional: true
 
     has_many :applicant_reviews, -> { order(:id) }, as: :applicant, inverse_of: :applicant, dependent: :destroy
@@ -171,7 +178,7 @@ module EffectiveMembershipsApplicant
       timestamps
     end
 
-    scope :deep, -> { includes(:user, :organization, :category, :from_category, :orders) }
+    scope :deep, -> { includes(:user, :organization, :category, :from_category, :from_status, :orders) }
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:approved, :declined]) }
@@ -186,7 +193,7 @@ module EffectiveMembershipsApplicant
 
     # Set Apply to Join or Reclassification
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
-      self.applicant_type = (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
+      self.applicant_type ||= can_apply_applicant_types_collection().first
       self.from_category = owner.membership&.category
       self.from_status = owner.membership&.status
     end
@@ -197,12 +204,18 @@ module EffectiveMembershipsApplicant
 
     # All Steps validations
     validates :user, presence: true
+
     validates :from_category, presence: true, if: -> { reclassification? }
+    validates :from_status, presence: true, if: -> { reinstatement? }
 
-    validate(if: -> { reclassification? }) do
+    validate(if: -> { reclassification? && category_id.present? }) do
       errors.add(:category_id, "can't reclassify to existing category") if category_id == from_category_id
     end
 
+    validate(if: -> { reinstatement? && category_id.present? }) do
+      errors.add(:category_id, "must match existing category when reinstatement") unless category_id == from_category_id
+    end
+
     validate(if: -> { category.present? }) do
       self.errors.add(:organization_id, "can't be blank when organization category") if category.organization? && organization.blank?
       self.errors.add(:organization_id, "must be blank when individual category") if category.individual? && organization.present?
@@ -315,6 +328,12 @@ module EffectiveMembershipsApplicant
       validates :declare_truth, acceptance: true
     end
 
+    # Reinstatements step
+    with_options(if: -> { current_step == :reinstatement }) do
+      validates :declare_reinstatement, acceptance: true
+    end
+
+
     # Admin Approve
     validate(if: -> { approved_membership_date.present? }) do
       if approved_membership_date.to_date > Time.zone.now.to_date
@@ -340,16 +359,19 @@ module EffectiveMembershipsApplicant
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
+      return self.class.all_wizard_steps if category.blank?
 
       @_required_steps ||= begin
-        wizard_steps = self.class.all_wizard_steps
+        # All required
         required_steps = self.class.required_wizard_steps
 
-        applicant_steps = Array(category&.applicant_wizard_steps)
+        # Based on current applicant
+        applicant_steps = (reinstatement? ? category.applicant_reinstatement_wizard_steps : category.applicant_wizard_steps)
 
-        # Special logic for stamp step
+        # Sanity check
         applicant_steps.delete(:stamp) unless apply_to_join?
         applicant_steps.delete(:organization) unless category&.organization?
+        applicant_steps.delete(:reinstatement) unless reinstatement?
 
         # change_wizard_steps is defined in effective_resources acts_as_wizard
         applicant_steps = change_wizard_steps(applicant_steps)
@@ -358,44 +380,63 @@ module EffectiveMembershipsApplicant
           raise('expected change_wizard_steps to return an Array of steps with no nils')
         end
 
-        wizard_steps.select do |step|
-          required_steps.include?(step) || category.blank? || applicant_steps.include?(step)
+        self.class.all_wizard_steps.select do |step|
+          required_steps.include?(step) || applicant_steps.include?(step)
         end
       end
     end
 
     def sidebar_steps
-      return self.class.required_wizard_steps unless category.present?
-      required_steps
+      has_completed_step?(:select) ? required_steps : self.class.required_wizard_steps
     end
 
     def can_visit_step?(step)
-      if missing_info?
-        return [:start, :select, :billing, :checkout].exclude?(step)
-      end
-
+      return [:start, :select, :billing, :checkout].exclude?(step) if missing_info?
       can_revisit_completed_steps(step)
     end
 
+    # Find fee
+    def fee(fee_type:)
+      fees.find { |fee| fee.fee_type == fee_type }
+    end
+
+    # Find or build
+    def build_fee(fee_type:)
+      fee(fee_type: fee_type) || fees.build(parent: self, owner: owner, fee_type: fee_type)
+    end
+
+    def applicant_fee_type
+      return 'Reinstatement' if reinstatement?
+      'Applicant'
+    end
+
     def applicant_fee_category
       category
     end
 
     def applicant_fee_price
+      return category.applicant_reinstatement_fee if reinstatement?
       category.applicant_fee
     end
 
     # All Fees and Orders
     def submit_fees
+      default_applicant_submit_fees
+    end
+
+    def default_applicant_submit_fees
       # Find or build submit fee
-      fee = fees.first || fees.build(owner: owner, fee_type: 'Applicant')
+      fee = fees.first || build_fee(fee_type: applicant_fee_type)
+
+      raise('expected a present applicant fee price') if applicant_fee_price.blank?
 
       unless fee.purchased?
         fee.assign_attributes(
-          category: applicant_fee_category(),
-          price: applicant_fee_price(),
-          tax_exempt: applicant_fee_category().applicant_fee_tax_exempt,
-          qb_item_name: applicant_fee_category().applicant_fee_qb_item_name
+          fee_type: applicant_fee_type,
+          category: applicant_fee_category,
+          price: applicant_fee_price,
+          tax_exempt: applicant_fee_category.applicant_fee_tax_exempt,
+          qb_item_name: applicant_fee_category.applicant_fee_qb_item_name
         )
       end
 
@@ -436,18 +477,9 @@ module EffectiveMembershipsApplicant
 
   # Instance Methods
   def to_s
-    if category.present? && category.present?
-      [
-        owner.to_s,
-        '-',
-        category,
-        'for',
-        category,
-        ("from #{from_category}" if reclassification?)
-      ].compact.join(' ')
-    else
-      'New Applicant'
-    end
+    return 'New Applicant' if applicant_type.blank? || category.blank? || owner.blank?
+
+    "#{owner} - #{applicant_type} to #{category}"
   end
 
   def owner
@@ -470,6 +502,10 @@ module EffectiveMembershipsApplicant
     applicant_type == 'Apply to Reclassify'
   end
 
+  def reinstatement?
+    applicant_type == 'Apply for Reinstatement'
+  end
+
   def individual?
     !(owner.kind_of?(EffectiveMemberships.Organization) && category&.organization?)
   end
@@ -519,6 +555,17 @@ module EffectiveMembershipsApplicant
     end.html_safe
   end
 
+  # Used by the select step
+  def can_apply_applicant_types_collection
+    if owner.blank? || owner.membership.blank? || owner.membership.categories.blank?
+      ['Apply to Join']
+    elsif owner.membership.statuses.present?
+      ['Apply for Reinstatement', 'Apply to Join']
+    else
+      ['Apply to Reclassify']
+    end
+  end
+
   # Used by the select step
   def can_apply_categories_collection
     categories = EffectiveMemberships.Category.sorted.can_apply
@@ -527,7 +574,7 @@ module EffectiveMembershipsApplicant
       return categories.where(can_apply_new: true)
     end
 
-    category_ids = user.memberships.map(&:category_ids).flatten
+    category_ids = user.membership.category_ids
 
     categories.select do |cat|
       cat.can_apply_existing? ||
@@ -587,7 +634,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_references_required?
-    min_applicant_references > 0
+    required_steps.include?(:references) && min_applicant_references > 0
   end
 
   # Endorsements Step
@@ -596,7 +643,7 @@ module EffectiveMembershipsApplicant
   end
 
   def applicant_endorsements_required?
-    min_applicant_endorsements > 0
+    required_steps.include?(:endorsements) && min_applicant_endorsements > 0
   end
 
   # Equivalences Step
@@ -610,7 +657,7 @@ module EffectiveMembershipsApplicant
   end
 
   def transcripts_required?
-    category.applicant_wizard_steps.include?(:transcripts)
+    required_steps.include?(:transcripts)
   end
 
   # Files Step
@@ -634,16 +681,16 @@ module EffectiveMembershipsApplicant
     requirements = {}
     return requirements unless category.present?
 
-    if category.applicant_wizard_steps.include?(:endorsements) || applicant_endorsements_required?
-      requirements['Applicant Endorsements'] = (!applicant_endorsements_required? || applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
+    if applicant_endorsements_required?
+      requirements['Applicant Endorsements'] = (applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
     end
 
-    if category.applicant_wizard_steps.include?(:references) || applicant_references_required?
-      requirements['Applicant References'] = (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
+    if applicant_references_required?
+      requirements['Applicant References'] = (applicant_references.count(&:completed?) >= min_applicant_references)
     end
 
-    if category.applicant_wizard_steps.include?(:transcripts) || transcripts_required?
-      requirements['Applicant Transcripts'] = (!transcripts_required? || transcripts_received?)
+    if transcripts_required?
+      requirements['Applicant Transcripts'] = transcripts_received?
     end
 
     requirements
@@ -692,9 +739,14 @@ module EffectiveMembershipsApplicant
   # When an application is completed, these must be done to go to reviewed
   # An Admin can override this and just set them to reviewed.
   def reviewed_requirements
-    {
-      'Applicant Reviews' => (!applicant_reviews_required? || applicant_reviews.count(&:completed?) >= min_applicant_reviews)
-    }
+    requirements = {}
+    return requirements unless category.present?
+
+    if applicant_reviews_required?
+      requirements['Applicant Reviews'] = (applicant_reviews.count(&:completed?) >= min_applicant_reviews)
+    end
+
+    requirements
   end
 
   def review!
@@ -726,6 +778,8 @@ module EffectiveMembershipsApplicant
       )
     elsif reclassification?
       EffectiveMemberships.Registrar.reclassify!(owner, to: category)
+    elsif reinstatement?
+      EffectiveMemberships.Registrar.reinstate!(owner)
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_category.rb

@@ -51,8 +51,9 @@ module EffectiveMembershipsCategory
       can_apply_restricted      :boolean
       can_apply_restricted_ids  :text
 
-      applicant_fee              :integer
-      applicant_wizard_steps     :text
+      applicant_fee                 :integer
+      applicant_reinstatement_fee   :integer
+      applicant_wizard_steps        :text
 
       min_applicant_educations          :integer
       min_applicant_endorsements        :integer
@@ -192,10 +193,16 @@ module EffectiveMembershipsCategory
     applicant_review_wizard_steps - EffectiveMemberships.ApplicantReview.required_wizard_steps
   end
 
+  # Apply to Join or Apply to Reclassify
   def applicant_wizard_steps
     (Array(self[:applicant_wizard_steps]) - [nil, '']).map(&:to_sym)
   end
 
+  # Apply for Reinstatement
+  def applicant_reinstatement_wizard_steps
+    [:reinstatement]
+  end
+
   def fee_payment_wizard_steps
     (Array(self[:fee_payment_wizard_steps]) - [nil, '']).map(&:to_sym)
   end

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -57,7 +57,7 @@ module EffectiveMembershipsFeePayment
     accepts_nested_attributes_for :organization
 
     belongs_to :category, polymorphic: true, optional: true
-    belongs_to :from_status, polymorphic: true, optional: true
+    belongs_to :with_status, polymorphic: true, optional: true
 
     # Effective Namespace
     has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
@@ -102,7 +102,7 @@ module EffectiveMembershipsFeePayment
 
     before_validation(if: -> { current_step == :start && user && user.membership }) do
       self.category ||= user.membership.categories.first if user.membership.categories.length == 1
-      self.from_status ||= user.membership.statuses.first if user.membership.statuses.length == 1
+      self.with_status ||= user.membership.statuses.first if user.membership.statuses.length == 1
     end
 
     # All Steps validations
@@ -121,17 +121,27 @@ module EffectiveMembershipsFeePayment
     # This required_steps is defined inside the included do .. end block so it overrides the acts_as_wizard one.
     def required_steps
       return self.class.test_required_steps if Rails.env.test? && self.class.test_required_steps.present?
+      return self.class.all_wizard_steps if category.blank?
 
       @_required_steps ||= begin
-        wizard_steps = self.class.all_wizard_steps
+        # All required
         required_steps = self.class.required_wizard_steps
 
-        fee_payment_steps = Array(category&.fee_payment_wizard_steps)
+        # Based on current fee payment
+        fee_payment_steps = Array(category.fee_payment_wizard_steps)
 
+        # Sanity Check
         fee_payment_steps.delete(:organization) unless organization?
 
-        wizard_steps.select do |step|
-          required_steps.include?(step) || category.blank? || fee_payment_steps.include?(step)
+        # change_wizard_steps is defined in effective_resources acts_as_wizard
+        fee_payment_steps = change_wizard_steps(fee_payment_steps)
+
+        unless fee_payment_steps.kind_of?(Array) && fee_payment_steps.all? { |step| step.kind_of?(Symbol) }
+          raise('expected change_wizard_steps to return an Array of steps with no nils')
+        end
+
+        self.class.all_wizard_steps.select do |step|
+          required_steps.include?(step) || fee_payment_steps.include?(step)
         end
       end
     end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -155,7 +155,6 @@ module EffectiveMembershipsRegistrar
     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?
 
-    # Todo. I dunno this was owner.membership.category
     from = owner.membership.category
 
     raise('expecting a to memberships category') unless to.class.respond_to?(:effective_memberships_category?)
@@ -183,6 +182,26 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
+  def reinstate!(owner, 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?)
+
+    date ||= Time.zone.now
+
+    membership = owner.membership
+    membership.membership_status(status: from).mark_for_destruction if from.present?
+
+    unless skip_fees
+      fee = owner.build_prorated_fee(date: date)
+      # This might already be present and purchased if joined and reinstated in the same period
+    end
+
+    save!(owner, date: date)
+  end
+
   # This clears the status entirely from user
   def status_remove!(owner, date: nil)
     status_change!(owner, to: nil, date: date)

data/app/models/concerns/effective_memberships_user.rb

@@ -28,6 +28,10 @@ module EffectiveMembershipsUser
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
 
+    # I'm an endorser for these
+    has_many :applicant_endorsements, -> { Effective::ApplicantEndorsement.sorted },
+      class_name: 'Effective::ApplicantEndorsement', inverse_of: :endorser, as: :endorser, dependent: :nullify
+
     scope :membership_applying, -> {
       applicants = EffectiveMemberships.Applicant.all
       without_role(:member).where(id: applicants.select(:user_id))

data/app/models/effective/applicant_endorsement.rb

@@ -39,6 +39,9 @@ module Effective
     end
 
     scope :deep, -> { all }
+    scope :sorted, -> { order(:id) }
+
+    scope :needs_endorser, -> { where(status: :submitted).where(applicant_id: EffectiveMemberships.Applicant.not_draft) }
 
     # All step validations
     validates :applicant, presence: true

data/app/models/effective/fee.rb

@@ -13,6 +13,9 @@ module Effective
     # The membership category for this fee, if there's only 1 membership.categories
     belongs_to :category, polymorphic: true, optional: true
 
+    # The membership status for this fee, if there's only 1 membership.statuses
+    belongs_to :with_status, polymorphic: true, optional: true
+
     effective_resource do
       fee_type          :string
 
@@ -35,6 +38,7 @@ module Effective
 
     before_validation(if: -> { owner && owner.membership }) do
       self.category ||= owner.membership.categories.first if owner.membership.categories.length == 1
+      self.with_status ||= owner.membership.statuses.first if owner.membership.statuses.length == 1
     end
 
     before_validation do
@@ -81,16 +85,20 @@ module Effective
 
     # Used by applicant.applicant_submit_fees
     def applicant_submit_fee?
-      fee_type == 'Applicant'
+      return true if parent.kind_of?(EffectiveMemberships.Applicant)
+
+      ['Applicant', 'Reinstatement'].include?(fee_type)
     end
 
     def fee_payment_fee?
-      fee_type != 'Applicant'
+      return false if parent.kind_of?(EffectiveMemberships.Applicant)
+
+      ['Applicant', 'Reinstatement'].exclude?(fee_type)
     end
 
     # Will advance a membership.fees_paid_through_year value when purchased
     def membership_period_fee?
-      fee_type == 'Prorated' || fee_type == 'Renewal'
+      ['Prorated', 'Renewal'].include?(fee_type)
     end
 
     def custom_fee?

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

@@ -0,0 +1,10 @@
+- datatable = EffectiveApplicantEndorsersDatatable.new(self, endorser: current_user)
+
+%h2 Endorsements
+
+- if datatable.present?
+  %p Your endorsement has been requested on the following applicants:
+  = render_simple_datatable(datatable)
+
+- else
+  %p There are no applicant endorsements to complete.

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

@@ -0,0 +1,9 @@
+= wizard_card(applicant) do
+  %table.table.table-sm
+    %tbody
+      %tr
+        %td= icon('check')
+        %td Yes, I am applying to reinstate from #{applicant.from_status || applicant.from_category}.
+      %tr
+        %td= icon('check')
+        %td Yes, I have read, understand and agree to the reinstatement declaration

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

@@ -0,0 +1,15 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  - completed = resource.has_completed_step?(:reinstatement)
+  - resource.declare_reinstatement = completed
+
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      = render_if_exists("effective/applicants/reinstatement_fields", f: f)
+
+      = f.check_box :declare_reinstatement, label: 'Yes, I accept and agree to the above'
+
+      = f.save 'Save and Continue'

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

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

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

@@ -0,0 +1 @@
+%p Please select a category for your application to join:

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

@@ -0,0 +1,5 @@
+- membership = f.object.owner.membership
+
+%p Apply to reclassify from #{membership.category}.
+
+%p Please select a category for your application to reclassify:

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

@@ -0,0 +1,25 @@
+- organization_categories = categories.select(&:organization?)
+
+- if categories.blank?
+  %p
+    There are no categories available for you to apply for.
+    Please contact us if you believe this is in error.
+
+- if categories.present?
+  = f.select :category_id, categories, required: true
+
+  - categories.each do |mc|
+    = f.show_if(:category_id, mc.id) do
+      .mb-4
+        %h3= mc.to_s
+
+        - if organization_categories.present?
+          %small.text-muted #{mc.category} #{mc.category_type} Membership
+
+        = mc.rich_text_body
+
+        = render_if_exists("effective/applicants/select/#{mc.to_s.parameterize.underscore}", f: f, category: mc)
+
+- if organization_categories.present?
+  = f.show_if_any(:category_id, organization_categories.map(&:id)) do
+    = render('effective/applicants/select_organization', f: f)

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

@@ -2,41 +2,49 @@
   = render 'effective/applicants/content', resource: resource
 
   - categories = resource.can_apply_categories_collection()
-  - organization_categories = categories.select(&:organization?)
+  - applicant_types = resource.can_apply_applicant_types_collection()
+  - existing_category = resource.owner&.membership&.category
 
   = card do
-    - if categories.blank?
-      %p
-        There are no categories available for you to apply for.
-        Please contact us if you believe this is in error.
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-    - if categories.present?
-      %p Please select a category to continue.
+      = f.hidden_field :stream, value: nil
+      = f.hidden_field :organization_id, value: nil
+      = f.hidden_field :organization_type, value: nil
 
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+      = f.hidden_field :applicant_type, value: applicant_types.first
+      = f.hidden_field :category_type, value: EffectiveMemberships.Category.name
 
-        = f.hidden_field :stream, value: nil
-        = f.hidden_field :organization_id, value: nil
-        = f.hidden_field :organization_type, value: nil
-        = f.hidden_field :category_type, value: EffectiveMemberships.Category.name
+      - if applicant_types == ['Apply to Join']
+        = render('effective/applicants/select/apply_to_join', f: f)
+        = render('effective/applicants/select/categories', f: f, categories: categories)
 
-        = f.select :category_id, categories, required: true
+      - elsif applicant_types == ['Apply for Reinstatement']
+        = f.hidden_field :applicant_type, value: applicant_types.first
+        = f.hidden_field :category_id, value: existing_category.id
+        = render('effective/applicants/select/apply_for_reinstatement', f: f)
 
-        - categories.each do |mc|
-          = f.show_if(:category_id, mc.id) do
-            .mb-4
-              %h3= mc.to_s
+      - elsif applicant_types == ['Apply to Reclassify']
+        = render('effective/applicants/select/apply_to_reclassify', f: f)
+        = render('effective/applicants/select/categories', f: f, categories: categories - [existing_category])
 
-              - if organization_categories.present?
-                %small.text-muted #{mc.category} #{mc.category_type} Membership
+      - else
+        = f.select :applicant_type, applicant_types, label: 'Apply to...'
 
-              = mc.rich_text_body
+        - if applicant_types.include?('Apply to Join')
+          = f.show_if :applicant_type, 'Apply to Join' do
+            = render('effective/applicants/select/apply_to_join', f: f)
+            = render('effective/applicants/select/categories', f: f, categories: categories)
 
-              = render_if_exists("effective/applicants/select/#{mc.to_s.parameterize.underscore}", f: f, category: mc)
+        - if applicant_types.include?('Apply to Reclassify')
+          = f.show_if :applicant_type, 'Apply to Reclassify' do
+            = render('effective/applicants/select/apply_to_reclassify', f: f)
+            = render('effective/applicants/select/categories', f: f, categories: categories - [existing_category])
 
-        - if organization_categories.present?
-          = f.show_if_any(:category_id, organization_categories.map(&:id)) do
-            = render('effective/applicants/select_organization', f: f)
+        - if applicant_types.include?('Apply for Reinstatement')
+          = f.show_if :applicant_type, 'Apply for Reinstatement' do
+            = f.hidden_field :category_id, value: existing_category.id
+            = render('effective/applicants/select/apply_for_reinstatement', f: f)
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/db/migrate/01_create_effective_memberships.rb.erb

@@ -18,6 +18,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
 
       t.text :applicant_wizard_steps
       t.integer :applicant_fee
+      t.integer :applicant_reinstatement_fee
 
       t.text :applicant_review_wizard_steps
 
@@ -458,6 +459,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :category_id
       t.string :category_type
 
+      t.integer :with_status_id
+      t.string :with_status_type
+
       t.string :fee_type
 
       t.integer :purchased_order_id
@@ -502,6 +506,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :category_id
       t.string :category_type
 
+      t.integer :with_status_id
+      t.string :with_status_type
+
       t.date :period
 
       # Acts as Statused

data/db/seeds.rb

@@ -9,6 +9,8 @@ if Rails.env.test?
   Effective::ApplicantCourseName.delete_all
 end
 
+Effective::Status.where(title: 'Resigned').first_or_create!
+
 member = Effective::Category.create!(
   title: "Full Member",
   can_apply_new: true,
@@ -18,6 +20,7 @@ member = Effective::Category.create!(
   min_applicant_references: 2,
   min_applicant_reviews: 2,
   applicant_fee: 100_00,
+  applicant_reinstatement_fee: 50_00,
   renewal_fee: 250_00,
   late_fee: 50_00,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
@@ -34,6 +37,7 @@ student = Effective::Category.create!(
   min_applicant_references: 0,
   min_applicant_reviews: 0,
   applicant_fee: 50_00,
+  applicant_reinstatement_fee: 25_00,
   renewal_fee: 125_00,
   late_fee: 25_00,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
@@ -49,6 +53,7 @@ retired = Effective::Category.create!(
   can_apply_restricted: true,
   can_apply_restricted_ids: [member.id],
   applicant_fee: 0,
+  applicant_reinstatement_fee: 0,
   renewal_fee: 0,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
   prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00,
@@ -66,6 +71,7 @@ member = Effective::Category.create!(
   min_applicant_references: 2,
   min_applicant_reviews: 2,
   applicant_fee: 100_00,
+  applicant_reinstatement_fee: 50_00,
   renewal_fee: 250_00,
   late_fee: 50_00,
   prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.5.0'
+  VERSION = '0.5.3'
 end

data/lib/effective_memberships.rb

@@ -54,7 +54,7 @@ module EffectiveMemberships
   end
 
   def self.fee_types
-    required = ['Applicant', 'Prorated', 'Discount', 'Renewal', 'Late', 'Admin']
+    required = ['Applicant', 'Reinstatement', 'Prorated', 'Discount', 'Renewal', 'Late', 'Admin']
     additional = Array(additional_fee_types)
 
     (required + additional).uniq.sort

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -292,6 +292,7 @@ files:
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_endorsements_datatable.rb
+- app/datatables/effective_applicant_endorsers_datatable.rb
 - app/datatables/effective_applicant_equivalences_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
@@ -391,6 +392,7 @@ files:
 - app/views/effective/applicant_endorsements/_form_declaration.html.haml
 - app/views/effective/applicant_endorsements/complete.html.haml
 - app/views/effective/applicant_endorsements/edit.html.haml
+- app/views/effective/applicant_endorsers/_dashboard.html.haml
 - app/views/effective/applicant_references/_applicant_reference.html.haml
 - app/views/effective/applicant_references/_datatable_actions.html.haml
 - app/views/effective/applicant_references/_form.html.haml
@@ -413,6 +415,7 @@ files:
 - app/views/effective/applicants/_orders.html.haml
 - app/views/effective/applicants/_organization.html.haml
 - app/views/effective/applicants/_references.html.haml
+- app/views/effective/applicants/_reinstatement.html.haml
 - app/views/effective/applicants/_select.html.haml
 - app/views/effective/applicants/_select_organization.html.haml
 - app/views/effective/applicants/_stamp.html.haml
@@ -431,7 +434,12 @@ files:
 - app/views/effective/applicants/files.html.haml
 - app/views/effective/applicants/organization.html.haml
 - app/views/effective/applicants/references.html.haml
+- app/views/effective/applicants/reinstatement.html.haml
 - app/views/effective/applicants/select.html.haml
+- app/views/effective/applicants/select/_apply_for_reinstatement.html.haml
+- app/views/effective/applicants/select/_apply_to_join.html.haml
+- app/views/effective/applicants/select/_apply_to_reclassify.html.haml
+- app/views/effective/applicants/select/_categories.html.haml
 - app/views/effective/applicants/stamp.html.haml
 - app/views/effective/applicants/start.html.haml
 - app/views/effective/applicants/submitted.html.haml