effective_memberships 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42637485b8a72cd2cf2a7f4845e75dbca8d3c379270d4dfe0a607e70610117d
-  data.tar.gz: 9d41bd14aad6e7e54c76568bd58147d43965fd30060c07525941294b7504d28e
+  metadata.gz: 612909b87d53748d9b3488893e419cf6f8bdcb852fdb07d3bd0f015bda89771c
+  data.tar.gz: 7c48d16e502036542d4f80e785986134e19466593b44ecce9cef151e76387acc
 SHA512:
-  metadata.gz: d456e9bcd40ce78fc83689c5352a85bc156ec50f7149bd169f7af1521d3ec1c58f6ed67b06922b28b36fec1cbb7c880a58e4e6c7ddcf197f3872e37fb5ac247b
-  data.tar.gz: 2f27824362cf294f83d4f953bb8c283045ef70a03910b17eeff1591f90df0a508bcf7dff1bbca53b49d6663f60d50376e9a8d4fb50da9cc47e6889724d34ef4d
+  metadata.gz: 835021e63b547f68e17ae9bd9ca6bbc523217e1f4f7c3eaf100696ef4456fb63b4f384765cad26db941aca67203ddb87e157ac64620e41220f98571a23d9074b
+  data.tar.gz: 706ec5a09d03a23f5495ccae6ec1f28fb930a4a1533a41b15f6f9a859f6e1bbb1d19dd9df0f83e0e6a56fb0bd6abe6d378576e5d1d439a2fa9ebaa3adfec2d69

data/app/controllers/admin/registrar_actions_controller.rb

@@ -14,6 +14,10 @@ module Admin
       success: -> { "#{resource.owner} has been reclassified to #{resource.owner.membership.category}" },
       redirect: -> { admin_owners_path(resource) }
 
+    submit :reinstate, 'Reinstate',
+      success: -> { "#{resource.owner} has been reinstated to #{resource.owner.membership.category}" },
+      redirect: -> { admin_owners_path(resource) }
+
     submit :status_assign, 'Assign Status',
       success: -> { "#{resource.owner} has been assigned #{resource.owner.membership.statuses_sentence}" },
       redirect: -> { admin_owners_path(resource) }

data/app/controllers/effective/membership_directory_controller.rb

@@ -16,6 +16,15 @@ module Effective
       @memberships = @membership_directory.results(page: params[:page])
     end
 
+    def show
+      @page_title = 'Directory'
+
+      @membership = Effective::Membership.find_by_token(params[:id])
+
+      EffectiveResources.authorize!(self, :show, @membership)
+      EffectiveResources.authorize!(self, :show, @membership.owner)
+    end
+
     def build_membership_directory
       directory = EffectiveMemberships.MembershipDirectory.new(search_params)
       directory.current_user = current_user

data/app/datatables/admin/effective_organizations_datatable.rb

@@ -63,7 +63,7 @@ module Admin
     end
 
     collection do
-      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(:addresses, membership: :membership_categories)
+      EffectiveMemberships.Organization.deep.left_joins(:membership).includes(:addresses, membership: [membership_categories: :category], representatives: :user)
     end
 
     def categories

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -3,25 +3,25 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   datatable do
     length 100
 
-    col(:name) { |membership| membership.owner.to_s }
-
+    col :owner_name, label: 'Name'
     col :joined_on
     col :number
-    col :categories, search: :string, label: 'Category'
-  end
-
-  collection do
-    scope = Effective::Membership.directory.all
 
-    archived_klasses.each do |klass|
-      scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)
+    col(:categories, search: categories, label: 'Category', sql_column: true).search do |collection, term|
+      collection.with_category(EffectiveMemberships.Category.find(term))
     end
 
-    scope
   end
 
-  def archived_klasses
-    @archived_klasses ||= Effective::Membership.owner_klasses.select { |klass| klass.try(:acts_as_archived?) }
+  collection do
+    Effective::Membership.deep.sorted
+      .in_good_standing
+      .without_archived_owners
+      .with_category(categories)
+  end
+
+  def categories
+    EffectiveMemberships.Category.membership_directory.all
   end
 
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -21,6 +21,10 @@ module EffectiveMembershipsApplicant
       [:start, :select, :summary, :billing, :checkout, :submitted]
     end
 
+    # Apply to Join - Anyone can do this
+    # Apply to Reclassify - Must have an existing membership and category
+    # Apply for Reinstatement - Must have a removed membership. Membership history.
+
     def categories
       ['Apply to Join', 'Apply to Reclassify', 'Apply for Reinstatement']
     end
@@ -101,7 +105,6 @@ module EffectiveMembershipsApplicant
     # 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
@@ -202,8 +205,8 @@ module EffectiveMembershipsApplicant
         self.from_category = owner.membership.categories.first
       end
 
-      if owner.membership.present? && reinstatement?
-        self.from_status = owner.membership.statuses.find { |status| status.reinstatable? }
+      if reinstatement?
+        self.from_category = owner.reinstatement_membership_category
       end
     end
 
@@ -215,7 +218,6 @@ module EffectiveMembershipsApplicant
     validates :user, presence: true
 
     validates :from_category, presence: true, if: -> { reclassification? }
-    validates :from_status, presence: true, if: -> { reinstatement? }
 
     validate(if: -> { reclassification? && category_id.present? }) do
       errors.add(:category_id, "can't reclassify to existing category") if category_id == from_category_id
@@ -603,10 +605,12 @@ module EffectiveMembershipsApplicant
 
   # Used by the select step
   def can_apply_applicant_types_collection
-    if owner.blank? || owner.membership.blank? || owner.membership.categories.blank?
+    if owner.blank?
       ['Apply to Join']
-    elsif owner.membership.statuses.any?(&:reinstatable?)
+    elsif owner.membership_removed?
       ['Apply for Reinstatement', 'Apply to Join']
+    elsif owner.membership.blank? || owner.membership.categories.blank?
+      ['Apply to Join']
     else
       ['Apply to Reclassify']
     end
@@ -861,7 +865,7 @@ module EffectiveMembershipsApplicant
     elsif reclassification?
       EffectiveMemberships.Registrar.reclassify!(owner, to: to_category, status: to_status)
     elsif reinstatement?
-      EffectiveMemberships.Registrar.reinstate!(owner, from: from_status)
+      EffectiveMemberships.Registrar.reinstate!(owner, to: to_category)
     else
       raise('unsupported approval applicant_type')
     end

data/app/models/concerns/effective_memberships_category.rb

@@ -114,6 +114,9 @@ module EffectiveMembershipsCategory
       .or(where(can_apply_restricted: true))
     }
 
+    # Can be used to limit which memberships are displayed in the directory
+    scope :membership_directory, -> { sorted }
+
     validates :title, presence: true, uniqueness: true
     validates :category_type, presence: true
     validates :position, presence: true

data/app/models/concerns/effective_memberships_directory.rb

@@ -19,18 +19,29 @@ module EffectiveMembershipsDirectory
     attr_accessor :term
     attr_accessor :category
 
+    # Users
     attr_accessor :first_name
     attr_accessor :last_name
 
+    # Organizations
+    attr_accessor :title
+
     validates :term, length: { minimum: 3, allow_blank: true }
     validates :first_name, length: { minimum: 2, allow_blank: true }
     validates :last_name, length: { minimum: 2, allow_blank: true }
+    validates :title, length: { minimum: 2, allow_blank: true }
+  end
+
+  def categories
+    EffectiveMemberships.Category.membership_directory.all
   end
 
   # Base collection to search. Can be configured per tenant.
   def collection
-    # Example::User.members.membership_in_good_standing.all
-    raise('to be implemented by app membership_directory')
+    Effective::Membership.deep.sorted
+      .in_good_standing
+      .without_archived_owners
+      .with_category(categories)
   end
 
   # Search Users and Organizations for only these fields. Passed into search_any. Return nil for all.
@@ -44,21 +55,21 @@ module EffectiveMembershipsDirectory
   end
 
   def present?
-    term.present? || first_name.present? || last_name.present? || category.present?
+    term.present? || first_name.present? || last_name.present? || title.present? || category.present?
   end
 
   # Search and assigns the collection
   # Assigns the entire collection() if there are no search terms
   # Otherwise validate the search terms
   def search!
-    @membership_owners = build_collection()
-    @membership_owners = @membership_owners.none if present? && !valid?
-    @membership_owners
+    @memberships = build_collection()
+    @memberships = @memberships.none if present? && !valid?
+    @memberships
   end
 
   # The unpaginated results of the search
-  def membership_owners
-    @membership_owners || collection
+  def memberships
+    @memberships || collection
   end
 
   # The paginated results
@@ -66,38 +77,53 @@ module EffectiveMembershipsDirectory
     page = (page || 1).to_i
     offset = [(page - 1), 0].max * per_page
 
-    membership_owners.limit(per_page).offset(offset)
+    memberships.limit(per_page).offset(offset)
   end
 
   protected
 
   def build_collection
-    owners = collection()
-    raise('expected an ActiveRecord collection') unless owners.kind_of?(ActiveRecord::Relation)
-    raise('expected a collection of membership_owners') unless owners.klass.respond_to?(:effective_memberships_owner?)
+    memberships = collection()
+    raise('expected an ActiveRecord collection') unless memberships.kind_of?(ActiveRecord::Relation)
+    raise('expected an ActiveRecord collection of Effective::Memberships') unless memberships.klass.respond_to?(:effective_membership?)
 
     # Filter by term
     if term.present?
-      owners = Effective::Resource.new(owners).search_any(term, columns: search_any_columns)
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(term, columns: search_any_columns) }
+      memberships = memberships.where(owner: owners)
     end
 
     # Filter by first name
     if first_name.present?
-      owners = Effective::Resource.new(owners).search_any(first_name, columns: :first_name)
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(first_name, columns: :first_name) }
+      memberships = memberships.where(owner: owners)
     end
 
     # Filter by last name
     if last_name.present?
-      owners = Effective::Resource.new(owners).search_any(last_name, columns: :last_name)
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(last_name, columns: :last_name) }
+      memberships = memberships.where(owner: owners)
+    end
+
+    # Filter by title
+    if title.present?
+      owners = owner_klasses.map { |klass| Effective::Resource.new(klass).search_any(last_name, columns: :title) }
+      memberships = memberships.where(owner: owners)
     end
 
     # Filter by category
     if category.present?
-      cat = EffectiveMemberships.Category.where(id: category)
-      owners = owners.members_with_category(cat) if cat.present?
+      memberships = memberships.with_category(EffectiveMemberships.Category.where(id: category))
     end
 
-    owners
+    # Return an ActiveRecord::Relation of Effective::Memberships
+    memberships
+  end
+
+  private
+
+  def owner_klasses
+    Effective::Membership.owner_klasses
   end
 
 end

data/app/models/concerns/effective_memberships_organization.rb

@@ -97,4 +97,8 @@ module EffectiveMembershipsOrganization
     representatives.reject(&:marked_for_destruction?).map(&:user)
   end
 
+  def membership_users
+    users.select { |user| user.is?(:member) && !user.archived? }
+  end
+
 end

data/app/models/concerns/effective_memberships_owner.rb

@@ -130,8 +130,25 @@ module EffectiveMembershipsOwner
   end
 
   def membership_removed_on
-    return nil unless membership_removed?
-    membership_histories.find { |history| history.removed? }.start_on
+    removed_membership_history.start_on if membership_removed?
+  end
+
+  # The membership history that is removed. Has exit statuses that may affect reinstatement fees.
+  def removed_membership_history
+    membership_histories.reverse.find { |history| history.removed? } if membership_removed?
+  end
+
+  # The membership history we would reinstate to. Should be the one just before removed.
+  def reinstatement_membership_history
+    membership_histories.reverse.find { |history| !history.removed? } if membership_removed?
+  end
+
+  def reinstatement_membership_category
+    reinstatement_membership_history.membership_categories.first if membership_removed?
+  end
+
+  def reinstatement_membership_statuses
+    reinstatement_membership_history.membership_statuses if membership_removed?
   end
 
   def registrar_action_categories(action)
@@ -139,7 +156,7 @@ module EffectiveMembershipsOwner
   end
 
   def registrar_action_statuses(action)
-    EffectiveMemberships.Status.sorted.all.where.not(id: EffectiveMemberships.Registrar.not_in_good_standing_status)
+    EffectiveMemberships.Status.sorted.all
   end
 
   def after_build_fee(fee)
@@ -311,9 +328,7 @@ module EffectiveMembershipsOwner
       EffectiveMemberships.Registrar.in_good_standing!(self)
     end
 
-    if membership_histories.blank?
-      build_membership_history()
-    end
+    build_membership_history() if membership_histories.blank?
 
     save!
   end
@@ -361,9 +376,10 @@ module EffectiveMembershipsOwner
     errors = []
     history = membership_histories.first
     last_history = membership_histories.last
+    was_removed = membership_histories.any? { |history| history.removed? }
 
     # Check membership joined on date matches first history start date
-    if membership.joined_on != history.start_on
+    if membership.joined_on != history.start_on && !was_removed
       errors << "The joined date #{membership.joined_on.strftime('%F')} does not match the first history start date of #{history.start_on.strftime('%F')}. Please change the first history start date to #{membership.joined_on.strftime('%F')} or update the joined date above."
     end
 

data/app/models/concerns/effective_memberships_registrar.rb

@@ -131,9 +131,12 @@ module EffectiveMembershipsRegistrar
     membership.registration_on = date  # Always new registration_on
 
     # Assign Number (this could be nil)
-    number = next_membership_number(owner, to: to) if number.blank?
-    membership.number = number
-    membership.number_as_integer = (Integer(number) rescue nil)
+    number = next_membership_number(owner, to: to) if number.nil?
+
+    if number.present?
+      membership.number = number
+      membership.number_as_integer = (Integer(number) rescue nil)
+    end
 
     # Assign Category
     membership.build_membership_category(category: to)
@@ -173,11 +176,13 @@ module EffectiveMembershipsRegistrar
 
     date ||= Time.zone.now
 
+    # Existing Membership
     membership = owner.membership
 
-    # Assign Category
+    # Last Changed Date
     membership.registration_on = date
 
+    # Assign Category
     membership.build_membership_category(category: to)
     membership.membership_category(category: from).mark_for_destruction
 
@@ -195,24 +200,60 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def reinstate!(owner, from:, date: nil, skip_fees: false)
+  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 an existing membership. use register! instead') if owner.membership.blank?
+    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?
 
-    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?)
+    to ||= owner.reinstatement_membership_category
+    raise('expecting a to memberships category') unless to.class.respond_to?(:effective_memberships_category?)
 
+    statuses = owner.reinstatement_membership_statuses
+
+    # Default Date
     date ||= Time.zone.now
+    period = period(date: date)
+    period_end_on = period_end_on(date: date)
 
-    membership = owner.membership
-    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?)
+    # Build a membership
+    membership = owner.build_membership
+
+    # Assign Dates
+    membership.joined_on = date
+    membership.registration_on = date
+
+    # Assign Number (this could be nil)
+    if history.number.present?
+      membership.number = history.number
+      membership.number_as_integer = (Integer(history.number) rescue nil)
+    end
+
+    # Assign Category
+    membership.build_membership_category(category: to)
+
+    # Assign Statuses
+    statuses.each do |status|
+      membership.build_membership_status(status: status)
+    end
 
+    # Assign fees paid through period
+    if skip_fees
+      membership.fees_paid_period = period
+      membership.fees_paid_through_period = period_end_on
+    end
+
+    # Or, Build Fees
     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
 
+    # Assign member role
+    add_member_role(owner)
+
+    # Save owner
     save!(owner, date: date)
   end
 
@@ -267,16 +308,17 @@ module EffectiveMembershipsRegistrar
     true
   end
 
-  def remove!(owner, date: nil)
+  # When you remove, you can set a status(es) which may affect reinstatement applications
+  def remove!(owner, statuses: nil, date: nil, notes: nil)
+    statuses = Array(statuses)
+
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member with a membership') unless owner.membership.present?
+    raise('expecting an membership status (optional)') if statuses.present? && statuses.any? { |status| !status.class.respond_to?(:effective_memberships_status?) }
 
     # Date
     date ||= Time.zone.now
 
-    # Remove Membership
-    owner.membership.mark_for_destruction
-
     # Delete unpurchased fees and orders
     owner.outstanding_fee_payment_fees.each { |fee| fee.mark_for_destruction }
     owner.outstanding_fee_payment_orders.each { |order| order.mark_for_destruction }
@@ -284,7 +326,17 @@ module EffectiveMembershipsRegistrar
     # Remove member role
     remove_member_role(owner)
 
-    save!(owner, date: date)
+    # Remove Membership
+    owner.membership.mark_for_destruction
+
+    # We do the save a bit differently here because we want to set the removed statuses
+    history = owner.build_membership_history(start_on: date, notes: notes)
+
+    if statuses.present?
+      history.assign_attributes(statuses: statuses.map(&:to_s), status_ids: statuses.map(&:id))
+    end
+
+    owner.save!
   end
 
   def not_in_good_standing!(owner, date: nil, notes: nil)

data/app/models/effective/membership.rb

@@ -1,6 +1,7 @@
 module Effective
   class Membership < ActiveRecord::Base
     belongs_to :owner, polymorphic: true
+    has_secure_token
 
     attr_accessor :current_action
 
@@ -24,30 +25,34 @@ module Effective
       fees_paid_period          :date     # The most recent period they have paid in. Start date of period.
       fees_paid_through_period  :date     # The most recent period they have paid in. End date of period. Kind of an expires.
 
+      # Membership Directory
+      owner_name                :string
+      token                     :string
+
       timestamps
     end
 
     scope :deep, -> { includes(:owner, membership_categories: :category, membership_statuses: :status) }
-    scope :sorted, -> { order(:id) }
+    scope :sorted, -> { order('lower(owner_name)') }
 
     scope :with_status, -> (statuses) {
-      raise('expected an EffectiveMemberships.Status') unless Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
-      where(id: MembershipStatus.where(status: statuses).select(:membership_id))
+      raise('expected an EffectiveMemberships.Status') unless statuses.class.respond_to?(:effective_memberships_status?) || Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+      where(id: MembershipStatus.where(status_id: statuses).select(:membership_id))
     }
 
     scope :without_status, -> (statuses) {
-      raise('expected an EffectiveMemberships.Status') unless Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
-      where.not(id: MembershipStatus.where(status: statuses).select(:membership_id))
+      raise('expected an EffectiveMemberships.Status') unless statuses.class.respond_to?(:effective_memberships_status?) || Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
+      where.not(id: MembershipStatus.where(status_id: statuses).select(:membership_id))
     }
 
     scope :with_category, -> (categories) {
-      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
-      where(id: MembershipCategory.where(category: categories).select(:membership_id))
+      raise('expected an EffectiveMemberships.Category') unless categories.class.respond_to?(:effective_memberships_category?) || Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+      where(id: MembershipCategory.where(category_id: categories).select(:membership_id))
     }
 
     scope :without_category, -> (categories) {
-      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
-      where.not(id: MembershipCategory.where(category: categories).select(:membership_id))
+      raise('expected an EffectiveMemberships.Category') unless categories.class.respond_to?(:effective_memberships_category?) || Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+      where.not(id: MembershipCategory.where(category_id: categories).select(:membership_id))
     }
 
     scope :joined_before, -> (date) {
@@ -73,14 +78,24 @@ module Effective
     scope :not_in_good_standing, -> { with_status(EffectiveMemberships.Registrar.not_in_good_standing_status) }
     scope :in_good_standing, -> { without_status(EffectiveMemberships.Registrar.not_in_good_standing_status) }
 
+    scope :without_archived_owners, -> {
+      where.not(owner: klass.acts_as_archived_owner_klasses.map { |klass| klass.archived })
+    }
+
     before_validation do
       self.registration_on ||= joined_on
     end
 
+    before_validation(if: -> { owner.present? }) do
+      self.owner_name = owner.to_s
+    end
+
     before_validation(if: -> { number_changed? }) do
       self.number_as_integer = (number.present? ? (Integer(number) rescue nil) : nil)
     end
 
+    validates :owner_name, presence: true
+
     validates :number, uniqueness: { allow_blank: true }
     validates :number, presence: true, if: -> { categories.any?(:membership_number_required?) }
 
@@ -100,11 +115,19 @@ module Effective
       maximum('number_as_integer') || 0
     end
 
+    def self.effective_membership?
+      true
+    end
+
     def self.owner_klasses
       klasses = Effective::Membership.distinct(:owner_type).pluck(:owner_type)
       klasses.select { |klass| klass.safe_constantize }.map { |klass| klass.constantize }
     end
 
+    def self.acts_as_archived_owner_klasses
+      owner_klasses.select { |klass| klass.try(:acts_as_archived?) }
+    end
+
     def to_s
       return 'membership' if owner.blank?
 

data/app/models/effective/membership_history.rb

@@ -25,13 +25,18 @@ module Effective
     serialize :status_ids, Array
 
     scope :deep, -> { includes(:owner) }
-    scope :sorted, -> { order(:start_on) }
+    scope :sorted, -> { order(:start_on).order(:id) }
 
     scope :removed, -> { where(removed: true) }
 
     validates :owner, presence: true
     validates :start_on, presence: true
 
+    with_options(if: -> { removed? }) do
+      validates :number, absence: { message: 'must be blank when removed' }
+      validates :category_ids, absence: { message: 'must be blank when removed' }
+    end
+
     def to_s
       'membership history'
     end

data/app/models/effective/registrar_action.rb

@@ -17,6 +17,9 @@ module Effective
     attr_accessor :membership_number
     attr_accessor :skip_fees
 
+    # Reinstate
+    attr_accessor :skip_fees
+
     # Status Change
     attr_accessor :status_ids
     attr_accessor :status_id
@@ -64,6 +67,11 @@ module Effective
       EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
     end
 
+    def reinstate!
+      update!(current_action: :reinstate)
+      EffectiveMemberships.Registrar.reinstate!(owner, skip_fees: skip_fees?)
+    end
+
     def status_assign!
       update!(current_action: :status_assign)
       EffectiveMemberships.Registrar.status_assign!(owner, status: statuses)
@@ -86,7 +94,7 @@ module Effective
 
     def remove!
       update!(current_action: :remove)
-      EffectiveMemberships.Registrar.remove!(owner)
+      EffectiveMemberships.Registrar.remove!(owner, statuses: statuses)
     end
 
     def assign_attributes(atts)

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

@@ -4,9 +4,13 @@
   - categories = EffectiveMemberships.Category.all
   = f.select :category_id, categories, label: 'Approve to'
 
+  - reinstatement = applicant.owner.reinstatement_membership_history if applicant.reinstatement?
+
   %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?
+      The member will keep their previous membership number: #{reinstatement.number}.
     - else
       - number = EffectiveMemberships.Registrar.next_membership_number(applicant.owner, to: applicant.category)
 
@@ -15,6 +19,9 @@
       - else
         No membership number will be assigned.
 
+  - if applicant.reinstatement?
+    %p The member will be reinstated with their previous status: #{badges(reinstatement.membership_statuses) || 'None'}.
+
   %h3 Fees
   %p The following fees will be created:
   - month = Time.zone.now.strftime('%B')
@@ -27,6 +34,9 @@
       %li A #{month} prorated fee to the new category
       %li A #{month} discount fee from their old category
 
+    - if applicant.reinstatement?
+      %li A #{month} prorated fee to their reinstatement category
+
   %p The following unpurchased fees will be deleted:
   - outstanding_fee_payment_fees = applicant.owner.outstanding_fee_payment_fees
 

data/app/views/admin/memberships/_form.html.haml

@@ -15,3 +15,7 @@
 - if membership.blank? && owner.membership_histories.present?
   = card('History') do
     = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: owner), inline: true, simple: true)
+
+- if owner.membership_removed?
+  - registrar_action = Effective::RegistrarAction.new(current_user: current_user, owner: owner)
+  = render 'admin/registrar_actions/form_reinstatement', registrar_action: registrar_action

data/app/views/admin/registrar_actions/_form.html.haml

@@ -15,3 +15,6 @@
   .mb-4= render 'admin/registrar_actions/form_not_in_good_standing', registrar_action: registrar_action
   .mb-4= render 'admin/registrar_actions/form_fees_paid', registrar_action: registrar_action
   .mb-4= render 'admin/registrar_actions/form_remove', registrar_action: registrar_action
+
+
+- # The reinstatement form is added by memberships/form and not here

data/app/views/admin/registrar_actions/_form_reinstatement.html.haml

@@ -0,0 +1,44 @@
+.card
+  .card-body
+    %h5.card-title Reinstate
+
+    = effective_form_with(model: [:admin, registrar_action], url: effective_memberships.admin_registrar_actions_path) do |f|
+      = f.hidden_field :owner_id
+      = f.hidden_field :owner_type
+
+      - removed = f.object.owner.removed_membership_history
+      - reinstatement = f.object.owner.reinstatement_membership_history
+
+      - raise('expected a removed membership history') unless removed.present?
+      - raise('expected a reinstatement membership history') unless reinstatement.present?
+
+      - period = EffectiveMemberships.Registrar.current_period
+
+      %p.text-muted
+        Reinstate to previous membership and optionally create fees.
+
+      %p
+        This member was removed on #{removed.start_on.strftime('%F')} from
+        = reinstatement.membership_categories.first
+        = badges(reinstatement.membership_statuses)
+        - if reinstatement.number.present?
+          with number #{reinstatement.number}.
+
+      = f.check_box :current_action, label: 'Yes, reinstate this member to their previous category, status and number'
+
+      = f.show_if :current_action, true do
+        = f.check_box :skip_fees, label: 'Yes, skip creating fees and just set the category'
+
+        = f.hide_if :skip_fees, true do
+          %p The following fee(s) will be created:
+          - month = Time.zone.now.strftime('%B')
+
+          %ul
+            %li A #{month} prorated fee for the #{reinstatement.membership_categories.first} category
+
+          %p The member will be required to return to the website and make a fee payment
+
+        = f.show_if :skip_fees, true do
+          %p No fees will be created
+
+        = f.submit 'Reinstate', border: false, center: true, 'data-confirm': "Really reinstate #{f.object.owner}?"

data/app/views/admin/registrar_actions/_form_remove.html.haml

@@ -13,5 +13,10 @@
       = f.check_box :current_action, label: 'Yes, remove this member'
 
       = f.show_if :current_action, true do
+        - statuses = f.object.owner.registrar_action_statuses(:remove)
+
+        - if statuses.present?
+          = f.select :status_ids, statuses, label: 'Remove with status', multiple: true, hint: 'Will be assigned to the membership history and may affect fees generated for reinstatement applicants'
+
         = f.submit 'Remove', border: false, center: true,
           'data-confirm': "Really remove #{f.object.owner}?"

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

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

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

@@ -3,7 +3,8 @@
 
   - categories = resource.can_apply_categories_collection()
   - applicant_types = resource.can_apply_applicant_types_collection()
-  - existing_category = resource.owner&.membership&.category
+  - existing_category = resource.owner.membership&.category
+  - reinstatement_category = resource.owner.reinstatement_membership_category
 
   = card do
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
@@ -20,11 +21,6 @@
         = render('effective/applicants/select/apply_to_join', f: f)
         = render('effective/applicants/select/categories', f: f, categories: categories)
 
-      - 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)
-
       - 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])
@@ -32,6 +28,11 @@
       - else
         = f.select :applicant_type, applicant_types, label: 'Apply to...'
 
+        - if applicant_types.include?('Apply for Reinstatement')
+          = f.show_if :applicant_type, 'Apply for Reinstatement' do
+            = f.hidden_field :category_id, value: reinstatement_category.id
+            = render('effective/applicants/select/apply_for_reinstatement', f: f)
+
         - 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)
@@ -42,9 +43,4 @@
             = render('effective/applicants/select/apply_to_reclassify', f: f)
             = render('effective/applicants/select/categories', f: f, categories: categories - [existing_category])
 
-        - 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'

data/app/views/effective/membership_directory/_form.html.haml

@@ -1,11 +1,14 @@
 = effective_form_with(scope: :q, model: membership_directory, method: :get, url: request.path) do |f|
-  - if f.object.term.present?
-    = f.search_field :term, label: 'Name'
+  = f.search_field :term, label: 'Name'
 
-  = f.search_field :first_name
-  = f.search_field :last_name
+  -# Users only
+  /= f.search_field :first_name
+  /= f.search_field :last_name
 
-  = f.select :category, EffectiveMemberships.Category.all
+  - # Organizations only
+  /= f.search_field :title
+
+  = f.select :category, membership_directory.categories
 
   = f.save('Search', class: 'btn btn-primary btn-search mr-3', name: nil)
   = link_to 'Reset filters', request.path

data/app/views/effective/membership_directory/_membership.html.haml

@@ -0,0 +1,20 @@
+= card do
+  %h6= membership.owner
+  %p= membership.categories.map(&:membership_directory_title).to_sentence
+  %p= membership.statuses.map(&:membership_directory_title).to_sentence
+
+  - if membership.owner.try(:email).present?
+    %p= reveal_mail_to(membership.owner.email)
+
+  - if (organizations = membership.owner.try(:membership_organizations)).present?
+    .mb-4.membership-directory-organizations
+      - organizations.each do |organization|
+        %div= organization
+
+  - if (users = membership.owner.try(:membership_users)).present?
+    .mb-4.membership-directory-users
+      - users.each do |user|
+        %div= user
+
+  - if EffectiveResources.authorized?(self, :show, membership) && EffectiveResources.authorized?(self, :show, membership.owner)
+    = link_to 'Show more', effective_memberships.membership_directory_path(membership.token)

data/app/views/effective/membership_directory/_membership_directory.html.haml

@@ -4,14 +4,14 @@
   - results = membership_directory.results(page: params[:page])
 
   - if membership_directory.present? && results.length == 0
-    .alert.alert-info There are no results for your search. Please try again.
+    .mt-4.alert.alert-info There are no results for your search. Please try again.
 
   - results.in_groups_of(3).each do |group|
     .row.mt-4
-      - group.each do |owner|
-        - next unless owner
+      - group.each do |membership|
         .col-md
-          = render('effective/membership_directory/membership_owner', membership: owner.membership, owner: owner)
+          - next unless membership
+          = render('effective/membership_directory/membership', membership: membership)
 
   %nav.d-flex.justify-content-center
     = bootstrap_paginate(results, per_page: membership_directory.per_page)

data/app/views/effective/membership_directory/show.html.haml

@@ -0,0 +1,25 @@
+= render 'layout' do
+  .effective-membership
+
+    %h6= @membership.owner
+    %p= @membership.categories.map(&:membership_directory_title).to_sentence
+    %p= @membership.statuses.map(&:membership_directory_title).to_sentence
+
+    - if @membership.owner.respond_to?(:rich_text_body)
+      .mb-4= @membership.owner.rich_text_body.to_s
+
+    - if @membership.owner.try(:email).present?
+      %p= reveal_mail_to(@membership.owner.email)
+
+    - if (organizations = @membership.owner.try(:membership_organizations)).present?
+      .mb-4.membership-directory-organizations
+        - organizations.each do |organization|
+          %div= organization
+
+    - if (users = @membership.owner.try(:membership_users)).present?
+      .mb-4.membership-directory-users
+        - users.each do |user|
+          %div= user
+
+  %hr
+  = link_to 'Return to Directory', effective_memberships.membership_directory_index_path, class: 'btn btn-primary'

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

@@ -35,6 +35,7 @@
 
 - if current_user.membership_removed?
   %p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.
+  %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?
   %p You are a representative for #{pluralize(membership_organizations.length, 'member organization')}.

data/config/routes.rb

@@ -26,7 +26,7 @@ EffectiveMemberships::Engine.routes.draw do
       resources :build, controller: :fee_payments, only: [:show, :update]
     end
 
-    resources :membership_directory, only: :index
+    resources :membership_directory, only: [:index, :show]
     get '/directory', to: 'membership_directory#index'
 
     resources :membership_cards, only: :index

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

@@ -95,6 +95,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.date :fees_paid_period
       t.date :fees_paid_through_period
 
+      t.string :owner_name
+      t.string :token
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_memberships/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -383,6 +383,7 @@ files:
 - app/views/admin/registrar_actions/_form_not_in_good_standing.html.haml
 - app/views/admin/registrar_actions/_form_reclassify.html.haml
 - app/views/admin/registrar_actions/_form_register.html.haml
+- app/views/admin/registrar_actions/_form_reinstatement.html.haml
 - app/views/admin/registrar_actions/_form_remove.html.haml
 - app/views/admin/registrar_actions/_form_status_change.html.haml
 - app/views/admin/representatives/_form.html.haml
@@ -482,9 +483,10 @@ files:
 - app/views/effective/membership_cards/index.html.haml
 - app/views/effective/membership_directory/_form.html.haml
 - app/views/effective/membership_directory/_layout.html.haml
+- app/views/effective/membership_directory/_membership.html.haml
 - app/views/effective/membership_directory/_membership_directory.html.haml
-- app/views/effective/membership_directory/_membership_owner.html.haml
 - app/views/effective/membership_directory/index.html.haml
+- app/views/effective/membership_directory/show.html.haml
 - app/views/effective/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml
 - app/views/effective/memberships_mailer/applicant_approved.liquid

data/app/views/effective/membership_directory/_membership_owner.html.haml

@@ -1,7 +0,0 @@
-= card do
-  %h6= owner
-  %p= membership.categories.map(&:membership_directory_title).to_sentence
-  %p= membership.statuses.map(&:membership_directory_title).to_sentence
-
-  - if owner.try(:email).present?
-    %p= reveal_mail_to(owner.email)