effective_memberships 0.4.17 → 0.5.1

data/app/models/concerns/effective_memberships_registrar.rb

@@ -42,11 +42,14 @@ module EffectiveMembershipsRegistrar
     period(date: date).end_of_year
   end
 
-  def assign!(owner, categories:, date: nil, number: nil)
+  # Category is required, statuses are optional
+  def assign!(owner, categories:, statuses: nil, date: nil, number: nil)
     categories = Array(categories)
+    statuses = Array(statuses)
 
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless categories.present? && categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting a membership category') if categories.blank? || categories.any? { |cat| !cat.class.respond_to?(:effective_memberships_category?) }
+    raise('expecting an membership status (optional)') if statuses.present? && statuses.any? { |status| !status.class.respond_to?(:effective_memberships_status?) }
 
     # Default Date and next number
     date ||= Time.zone.now
@@ -64,6 +67,17 @@ module EffectiveMembershipsRegistrar
     membership.number ||= number
     membership.number_as_integer ||= (Integer(number) rescue nil)
 
+    # Delete any removed statuses
+    membership.membership_statuses.each do |membership_status|
+      next if statuses.include?(membership_status.status)
+      membership_status.mark_for_destruction
+    end
+
+    # Build any additional statuses
+    statuses.each do |status|
+      membership.build_membership_status(status: status)
+    end
+
     # Delete any removed categories
     membership.membership_categories.each do |membership_category|
       next if categories.include?(membership_category.category)
@@ -76,6 +90,7 @@ module EffectiveMembershipsRegistrar
     end
 
     changed = membership.membership_categories.any? { |mc| mc.new_record? || mc.marked_for_destruction? }
+    changed ||= membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }
 
     if changed
       membership.registration_on = date # Always new registration_on
@@ -88,9 +103,10 @@ module EffectiveMembershipsRegistrar
     owner.update_membership_status!
   end
 
-  def register!(owner, to:, date: nil, number: nil, skip_fees: false)
+  def register!(owner, to:, status: nil, date: nil, number: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expecting a memberships category') unless to.class.respond_to?(:effective_memberships_category?)
+    raise('expecting a memberships status') unless status.nil? || status.class.respond_to?(:effective_memberships_status?)
     raise('owner has existing membership. use reclassify! instead.') if owner.membership.present?
 
     # Default Date and next number
@@ -113,6 +129,9 @@ module EffectiveMembershipsRegistrar
     # Assign Category
     membership.build_membership_category(category: to)
 
+    # Assign Status
+    membership.build_membership_status(status: status) if status.present?
+
     # Assign fees paid through period
     if skip_fees
       membership.fees_paid_period = period
@@ -136,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?)
@@ -164,6 +182,54 @@ 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)
+  end
+
+  # To can be nil to clear the status entirely
+  def status_change!(owner, to:, date: nil)
+    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 to memberships status') if to.present? && !to.class.respond_to?(:effective_memberships_status?)
+    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
+    raise('expected to and from to be different') if from == to
+
+    date ||= Time.zone.now
+
+    membership = owner.membership
+
+    # Assign Status
+    membership.build_membership_status(status: to) if to.present?
+    membership.membership_status(status: from).mark_for_destruction if from.present?
+
+    # Save
+    save!(owner, date: date)
+  end
+
   def remove!(owner, date: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('expected a member') unless owner.membership.present?

data/app/models/concerns/effective_memberships_status.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# EffectiveMembershipsStatus
+#
+# Mark your status model with effective_memberships_status to get all the includes
+
+module EffectiveMembershipsStatus
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_memberships_status
+      include ::EffectiveMembershipsStatus
+    end
+  end
+
+  module ClassMethods
+    def effective_memberships_status?; true; end
+
+    def status_types
+      ['Individual', 'Organization']
+    end
+
+    def statuses
+      []
+    end
+  end
+
+  included do
+    log_changes(except: :memberships) if respond_to?(:log_changes)
+
+    has_many :membership_statuses, class_name: 'Effective::MembershipStatus', as: :status
+
+    effective_resource do
+      status_type           :string
+
+      title                 :string
+      status                :string         # Unused but must belong to self.class.statuses
+      position              :integer
+
+      timestamps
+    end
+
+    scope :deep, -> { all }
+    scope :sorted, -> { order(:position) }
+
+    validates :title, presence: true, uniqueness: true
+    validates :status_type, presence: true
+    validates :position, presence: true
+
+    before_validation do
+      self.position ||= (self.class.pluck(:position).compact.max || -1) + 1
+      self.status_type ||= self.class.status_types.first
+    end
+
+  end
+
+  # Instance Methods
+
+  def to_s
+    title.presence || 'New Membership Status'
+  end
+
+  def individual?
+    status_type == 'Individual'
+  end
+
+  def organization?
+    status_type == 'Organization'
+  end
+
+end

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/models/effective/membership.rb

@@ -7,6 +7,9 @@ module Effective
     has_many :membership_categories, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
     accepts_nested_attributes_for :membership_categories
 
+    has_many :membership_statuses, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
+    accepts_nested_attributes_for :membership_statuses
+
     log_changes(to: :owner) if respond_to?(:log_changes)
 
     effective_resource do
@@ -74,7 +77,8 @@ module Effective
       summary = [
         owner.to_s,
         'is',
-        (categories.to_sentence),
+        (statuses.to_sentence if statuses.present?),
+        (categories.to_sentence if categories.present?),
         'member',
         "##{number_was}",
         "who joined #{joined_on&.strftime('%F') || '-'}",
@@ -85,6 +89,8 @@ module Effective
       (summary + '.').html_safe
     end
 
+    ## Membership Categories
+
     # We can't use the polymorphic has_many. So this is a helper.
     def categories
       membership_categories.reject(&:marked_for_destruction?).map(&:category)
@@ -96,12 +102,12 @@ module Effective
 
     # We might want to use singular memberships.
     def category
-      raise('expected singular usage but there are more than one membership') if categories.length > 1
+      raise('expected singular usage but there are more than one membership category') if categories.length > 1
       categories.first
     end
 
     def category_id
-      raise('expected singular usage but there are more than one membership') if categories.length > 1
+      raise('expected singular usage but there are more than one membership category') if categories.length > 1
       categories.first.id
     end
 
@@ -115,6 +121,38 @@ module Effective
       membership_category(category: category) || membership_categories.build(category: category)
     end
 
+    ## Membership Statuses
+
+    # We can't use the polymorphic has_many. So this is a helper.
+    def statuses
+      membership_statuses.reject(&:marked_for_destruction?).map(&:status)
+    end
+
+    def status_ids
+      membership_statuses.reject(&:marked_for_destruction?).map(&:status_id)
+    end
+
+    # We might want to use singular memberships.
+    def status
+      raise('expected singular usage but there are more than one membership status') if statuses.length > 1
+      statuses.first
+    end
+
+    def status_id
+      raise('expected singular usage but there are more than one membership status') if statuses.length > 1
+      statuses.first.id
+    end
+
+    def membership_status(status:)
+      raise('expected a status') unless status.class.respond_to?(:effective_memberships_status?)
+      membership_statuses.find { |ms| ms.status_id == status.id && ms.status_type == status.class.name }
+    end
+
+    # find or build
+    def build_membership_status(status:)
+      membership_status(status: status) || membership_statuses.build(status: status)
+    end
+
     def good_standing?
       !bad_standing?
     end

data/app/models/effective/membership_history.rb

@@ -22,16 +22,15 @@ module Effective
     serialize :categories, Array
     serialize :category_ids, Array
 
+    serialize :statuses, Array
+    serialize :status_ids, Array
+
     scope :deep, -> { includes(:owner) }
     scope :sorted, -> { order(:start_on) }
 
     scope :removed, -> { where(removed: true) }
 
     validates :owner, presence: true
-
-    # validates :categories, presence: true, unless: -> { removed? }
-    # validates :category_ids, presence: true, unless: -> { removed? }
-
     validates :start_on, presence: true
 
     def to_s
@@ -44,6 +43,10 @@ module Effective
       category_ids.present? ? EffectiveMemberships.Category.where(id: category_ids) : []
     end
 
+    def membership_statuses
+      status_ids.present? ? EffectiveMemberships.Status.where(id: status_ids) : []
+    end
+
     def membership_category_ids
       membership_categories.map(&:id)
     end
@@ -53,5 +56,15 @@ module Effective
       assign_attributes(categories: categories.map(&:to_s), category_ids: categories.map(&:id))
     end
 
+    def membership_status_ids
+      membership_statuses.map(&:id)
+    end
+
+    def membership_status_ids=(ids)
+      statuses = EffectiveMemberships.Status.where(id: ids)
+      assign_attributes(statuses: statuses.map(&:to_s), status_ids: statuses.map(&:id))
+    end
+
+
   end
 end

data/app/models/effective/membership_status.rb

@@ -0,0 +1,13 @@
+module Effective
+  class MembershipStatus < ActiveRecord::Base
+    belongs_to :status, polymorphic: true
+    belongs_to :membership, polymorphic: true
+
+    log_changes(to: :membership) if respond_to?(:log_changes)
+
+    def to_s
+      status&.to_s || 'membership status'
+    end
+
+  end
+end

data/app/models/effective/registrar_action.rb

@@ -12,13 +12,21 @@ module Effective
     # Bad Standing
     attr_accessor :bad_standing_reason
 
+    # Register
+    attr_accessor :status_id
+
     # Reclassify & Register
     attr_accessor :category_id
     attr_accessor :membership_number
     attr_accessor :skip_fees
 
+    # Status Change
+    attr_accessor :status_id
+    attr_accessor :status_remove_action
+
     # Assign
     attr_accessor :category_ids
+    attr_accessor :status_ids
 
     # Mark Fees Paid - Order Attributes
     attr_accessor :payment_provider
@@ -38,6 +46,10 @@ module Effective
     validates :category_id, presence: true,
       if: -> { current_action == :reclassify || current_action == :register }
 
+    # Status Change
+    validates :status_id, presence: true, if: -> { current_action == :status_change }
+
+    # Assign
     validates :category_ids, presence: true, if: -> { current_action == :assign }
 
     def to_s
@@ -46,7 +58,7 @@ module Effective
 
     def register!
       update!(current_action: :register)
-      EffectiveMemberships.Registrar.register!(owner, to: category, number: membership_number.presence, skip_fees: skip_fees?)
+      EffectiveMemberships.Registrar.register!(owner, to: category, status: status, number: number, skip_fees: skip_fees?)
     end
 
     def reclassify!
@@ -54,9 +66,19 @@ module Effective
       EffectiveMemberships.Registrar.reclassify!(owner, to: category, skip_fees: skip_fees?)
     end
 
+    def status_change!
+      update!(current_action: :status_change)
+      EffectiveMemberships.Registrar.status_change!(owner, to: status)
+    end
+
+    def status_remove!
+      update!(current_action: :status_remove)
+      EffectiveMemberships.Registrar.status_remove!(owner)
+    end
+
     def assign!
       update!(current_action: :assign)
-      EffectiveMemberships.Registrar.assign!(owner, categories: categories, number: membership_number.presence)
+      EffectiveMemberships.Registrar.assign!(owner, categories: categories, statuses: statuses, number: number)
     end
 
     def good_standing!
@@ -102,11 +124,23 @@ module Effective
     private
 
     def category
-      EffectiveMemberships.Category.find(@category_id) if @category_id
+      EffectiveMemberships.Category.find(@category_id) if @category_id.present?
     end
 
     def categories
-      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
+      EffectiveMemberships.Category.where(id: @category_ids) if @category_ids.present?
+    end
+
+    def status
+      EffectiveMemberships.Status.find(@status_id) if @status_id.present?
+    end
+
+    def statuses
+      EffectiveMemberships.Status.where(id: @status_ids) if @status_ids.present?
+    end
+
+    def number
+      membership_number.presence
     end
 
     def order_attributes

data/app/models/effective/status.rb

@@ -0,0 +1,7 @@
+module Effective
+  class Status < ActiveRecord::Base
+    self.table_name = EffectiveMemberships.statuses_table_name.to_s
+
+    effective_memberships_status
+  end
+end

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

@@ -11,7 +11,9 @@
 
   = f.date_field :end_on, hint: 'The end date of this period in history. Must be present for all past histories. Must be blank in the most recent history, unless membership removed.'
   = f.text_field :number, hint: 'The membership number'
+
   = f.select :membership_category_ids, EffectiveMemberships.Category.all.sorted, label: 'Membership Categories', hint: 'The membership category or categories held during this period in history.'
+  = f.select :membership_status_ids, EffectiveMemberships.Status.all.sorted, label: 'Membership Statuses', hint: 'The membership status or statuses held during this period in history.'
 
   = f.check_box :bad_standing, hint: 'Membership in bad standing'
   = f.check_box :removed, hint: 'Membership removed'

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

@@ -1,10 +1,17 @@
 - registrar_action = Effective::RegistrarAction.new(current_user: current_user, owner: owner)
 
+-# This form is great if we want to do multiple categories or statuses
+-#.mb-4= render 'admin/registrar_actions/form_assign', registrar_action: registrar_action
+
 - if owner.membership.blank?
   .mb-4= render 'admin/registrar_actions/form_register', registrar_action: registrar_action
 
 - if owner.membership.present?
   .mb-4= render 'admin/registrar_actions/form_reclassify', registrar_action: registrar_action
+
+  - if owner.registrar_action_statuses(:status_change).present?
+    .mb-4= render 'admin/registrar_actions/form_status_change', registrar_action: registrar_action
+
   .mb-4= render 'admin/registrar_actions/form_bad_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

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

@@ -8,21 +8,41 @@
 
       - membership = f.object.owner.membership
 
+      - categories = f.object.owner.registrar_action_categories(:assign)
+      - statuses = f.object.owner.registrar_action_statuses(:assign)
+      - label = [('categories' if categories.present?), ('statuses' if statuses.present?)].join(' or ')
+
+      - if membership.present?
+        - f.object.category_ids = membership.category_ids
+        - f.object.status_ids = membership.status_ids
+
       %p.text-muted
-        Assign to one or more categories.
+        Assign to #{label}.
+
+      - if categories.present?
+        = f.static_field :current_action, label: 'Current Categories' do
+          - Array(membership&.categories).each do |category|
+            %div= link_to(category, effective_memberships.edit_admin_category_path(category))
 
-      = f.static_field :current_action, label: 'Current Categories' do
-        - Array(membership&.categories).each do |category|
-          %div= link_to(category, effective_memberships.edit_admin_category_path(category))
+          - if membership&.categories.blank?
+            None
 
-        - if membership.blank?
-          None
+      - if statuses.present?
+        = f.static_field :current_action, label: 'Current Statuses' do
+          - Array(membership&.statuses).each do |status|
+            %div= link_to(status, effective_memberships.edit_admin_status_path(status))
 
-      = f.check_box :current_action, label: 'Yes, assign this member to categories'
+          - if membership&.statuses.blank?
+            None
+
+      = f.check_box :current_action, label: "Yes, assign this member to #{label}"
 
       = f.show_if :current_action, true do
-        - categories = f.object.owner.registrar_action_categories(:assign)
-        = f.select :category_ids, categories, label: 'Assign to', required: true, multiple: true
+        - if categories.present?
+          = f.select :category_ids, categories, label: 'Assign to', required: true, multiple: true
+
+        - if statuses.present?
+          = f.select :status_ids, statuses, label: false, required: true, multiple: true
 
         - if membership.present?
           %p The member will keep their existing membership number: #{membership.number}.

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

@@ -7,6 +7,8 @@
       = f.hidden_field :owner_type
 
       - period = EffectiveMemberships.Registrar.current_period
+      - categories = f.object.owner.registrar_action_categories(:register)
+      - statuses = f.object.owner.registrar_action_statuses(:register)
 
       %p.text-muted
         Register into a new category and optionally create fees.
@@ -17,8 +19,11 @@
       = f.check_box :current_action, label: 'Yes, register to a membership'
 
       = f.show_if :current_action, true do
-        - categories = f.object.owner.registrar_action_categories(:register)
-        = f.select :category_id, categories, label: 'Register to'
+        - if categories.present?
+          = f.select :category_id, categories, label: 'Register to'
+
+        - if statuses.present?
+          = f.select :status_id, statuses, label: false
 
         = f.text_field :membership_number, hint: "leave blank to assign the next number"
 

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

@@ -0,0 +1,41 @@
+.card
+  .card-body
+    %h5.card-title Status Change
+
+    = 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
+
+      - membership = f.object.owner.membership
+      - period = EffectiveMemberships.Registrar.current_period
+
+      %p.text-muted
+        Change or remove a member's existing status.
+
+      = f.static_field :current_action, label: 'Current Status' do
+        = (membership.status || 'None').to_s
+
+      = f.check_box :current_action, label: 'Yes, change member status'
+
+      = f.show_if :current_action, true do
+        %p The member will keep their existing membership number: #{membership.number}.
+
+        - statuses = f.object.owner.registrar_action_statuses(:status_change) - membership.statuses
+        = f.select :status_id, statuses, label: 'Change status to', required: true
+
+        %p No fees will be created
+
+        = f.submit 'Change Status', border: false, center: true, 'data-confirm': "Really change #{f.object.owner}?"
+
+      - # Remove Action
+      - if membership.status.present?
+        = f.check_box :status_remove_action, label: "Yes, remove #{membership.status} status"
+
+        = f.show_if :status_remove_action, true do
+          %p The member will keep their existing membership number: #{membership.number}
+
+          %p This action will remove the #{membership.status} status
+
+          %p No fees will be created
+
+          = f.submit 'Remove Status', border: false, center: true, 'data-confirm': "Really remove status #{f.object.owner}?"

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

@@ -0,0 +1,8 @@
+= tabs do
+  = tab 'Status' do
+    = render 'admin/statuses/form_status', status: status
+
+  - if status.persisted?
+    - if status.respond_to?(:log_changes_datatable)
+      = tab 'Logs' do
+        = render_inline_datatable(status.log_changes_datatable)

data/app/views/admin/statuses/_form_status.html.haml

@@ -0,0 +1,9 @@
+= effective_form_with(model: [:admin, status], engine: true) do |f|
+  = f.text_field :title
+
+  = f.select :status_type, f.object.class.status_types
+
+  - if f.object.class.statuses.present?
+    = f.select :status, f.object.class.statuses
+
+  = f.submit

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}.