effective_memberships 0.4.7 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a59918a13a42cc9da99200ecfa61ed9b45ae8881ca7e9c0d4e2fd0117605003
-  data.tar.gz: b1955f238384bbb8cfc4836ad06357b1b815c47c23a9e8ac11303e858feb8379
+  metadata.gz: b7d09ef68f61058a8ee29567caa3a008d887482edab0fa3e8d251ea69f9ea3cb
+  data.tar.gz: 10a88e200464a6d2d7dbb8fbdcaa3aed77337b067e12fc3577b31a8032cbd2ce
 SHA512:
-  metadata.gz: e2ad995fdad088a4db63c1f98467330a1315deb55fe6c912e12662a1a66d017365fd2c379038d7422f9cf5a5b9b7338aa24c05e65f519360be075098ffc4628d
-  data.tar.gz: de64346cc2ce1119672f925d2f60589b4e9e5cd0c5ab506438cee5e7ec2e31e36a79924ed26896c5e0bec639f6033401317e254adcdd03dc8ccf279d75f0a0c9
+  metadata.gz: 3adbdb1ab5f18df509ebc6631f39a142f2857213ce9ee0a23b83eec2fa44dda3d8b77c42afe7e4e4b494bb938dac7aee672cc26dacbd398fd9f34cc3c55ed222
+  data.tar.gz: ab80c7ff8b01736429ecabc774b81c45702d21ae521e2e7db276191802fa212171f8e81e448a06e452fb97745c5aec3723fe37537669f3a3ed87b9cd30d03746

data/app/assets/javascripts/effective_memberships/applicant_experiences.js

@@ -31,8 +31,3 @@ $(document).on('change dp.change keyup', "[data-applicant-experiences-month]", f
   const $form = $(event.currentTarget).closest('form');
   sumApplicantExperiences($form);
 });
-
-
-// $(document).on 'cocoon:after-remove', (event) ->
-//   $form = $(event.target).closest('form')
-//   sumMonths($form) if $form.find('[data-experience-month]').length > 0

data/app/controllers/admin/applicant_endorsements_controller.rb

@@ -0,0 +1,9 @@
+module Admin
+  class ApplicantEndorsementsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+  end
+end

data/app/controllers/admin/memberships_controller.rb

@@ -5,7 +5,7 @@ module Admin
 
     include Effective::CrudController
 
-    submit :save, 'Update Membership',
+    submit :revise, 'Update Membership',
       success: -> { "#{resource.owner} has been successfully updated. Please double check the membership history is correct" },
       redirect: -> { admin_owners_path(resource) }
 

data/app/controllers/effective/applicant_endorsements_controller.rb

@@ -0,0 +1,48 @@
+module Effective
+  class ApplicantEndorsementsController < ApplicationController
+    include Effective::CrudController
+    include Effective::Select2AjaxController
+
+    page_title 'Confidential Endorsement Form'
+
+    # The show and update actions are public routes but can only be reached by the token.
+    # The endorser must declare and submit the form
+    # To move an applicant endorsement from submitted to completed
+
+    submit :notify, 'Resend email notification',
+      success: -> { "Sent email notification to #{resource.email}" }
+
+    submit :complete, 'Complete Endorsement'
+
+    def show
+      @applicant_endorsement = ApplicantEndorsement.submitted.find(params[:id])
+      EffectiveResources.authorize!(self, :show, @applicant_endorsement)
+
+      render 'edit'
+    end
+
+    # Must be signed in
+    def select2_ajax_endorser
+      authenticate_user! if defined?(Devise)
+
+      applicant = EffectiveMemberships.Applicant.find(params[:applicant_id])
+      collection = Effective::ApplicantEndorsement.endorser_collection(applicant)
+
+      respond_with_select2_ajax(collection)
+    end
+
+    protected
+
+    def permitted_params
+      permitted = params.require(:effective_applicant_endorsement).permit!.except(:token, :last_notified_at, :status, :status_steps, :applicant_id, :endorser_id)
+
+      if current_user && current_user.memberships_owners.include?(resource.applicant&.owner)
+        permitted.except(:notes, :accept_declaration)
+      else
+        permitted
+      end
+
+    end
+
+  end
+end

data/app/controllers/effective/applicant_references_controller.rb

@@ -23,7 +23,7 @@ module Effective
     protected
 
     def permitted_params
-      permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
+      permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps, :applicant_id)
 
       if current_user && current_user.memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)

data/app/datatables/admin/effective_applicant_endorsements_datatable.rb

@@ -0,0 +1,35 @@
+module Admin
+  class EffectiveApplicantEndorsementsDatatable < Effective::Datatable
+
+    datatable do
+      order :name
+
+      col :applicant
+
+      col :endorser
+      col :email
+      col :name
+      col :phone
+      col :unknown_member, visible: false
+
+      col :status do |endorsement|
+        if endorsement.submitted?
+          'Waiting on response'
+        elsif endorsement.completed?
+          'Completed'
+        end
+      end
+
+      col :last_notified_at do |endorsement|
+        endorsement.last_notified_at&.strftime('%F') unless endorsement.completed?
+      end
+
+      actions_col
+    end
+
+    collection do
+      Effective::ApplicantEndorsement.deep.all
+    end
+
+  end
+end

data/app/datatables/effective_applicant_endorsements_datatable.rb

@@ -0,0 +1,37 @@
+# For the applicant complete step to add additional endorsements
+class EffectiveApplicantEndorsementsDatatable < Effective::Datatable
+
+  datatable do
+    order :name
+
+    col :name do |endorsement|
+      endorser&.to_s || name
+    end
+
+    col :email
+    col :phone
+
+    col :status do |reference|
+      if reference.submitted?
+        'Waiting on response'
+      elsif reference.completed?
+        'Completed'
+      end
+    end
+
+    col :last_notified_at do |endorsement|
+      endorsement.last_notified_at&.strftime('%F') unless endorsement.completed?
+    end
+
+    actions_col partial: 'effective/applicant_endorsements/datatable_actions', partial_as: :applicant_endorsement
+  end
+
+  collection do
+    Effective::ApplicantEndorsement.deep.where(applicant: applicant)
+  end
+
+  def applicant
+    @applicant ||= EffectiveMemberships.Applicant.where(id: attributes[:applicant_id]).first!
+  end
+
+end

data/app/datatables/effective_applicant_references_datatable.rb

@@ -1,4 +1,4 @@
-# For the applicant complete step to add additional applicants
+# For the applicant complete step to add additional references
 class EffectiveApplicantReferencesDatatable < Effective::Datatable
 
   datatable do

data/app/mailers/effective/memberships_mailer.rb

@@ -44,6 +44,16 @@ module Effective
       mail(to: resource.user.email, subject: subject, **headers)
     end
 
+    def applicant_endorsement_notification(resource, opts = {})
+      @assigns = assigns_for(resource)
+      @applicant_endorsement = resource
+
+      subject = subject_for(__method__, 'Endorsement Requested', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.email, subject: subject, **headers)
+    end
+
     def applicant_reference_notification(resource, opts = {})
       @assigns = assigns_for(resource)
       @applicant_reference = resource
@@ -61,6 +71,10 @@ module Effective
         return applicant_assigns(resource).merge(owner_assigns(resource.owner))
       end
 
+      if resource.kind_of?(Effective::ApplicantEndorsement)
+        return endorsement_assigns(resource).merge(owner_assigns(resource.applicant.owner))
+      end
+
       if resource.kind_of?(Effective::ApplicantReference)
         return reference_assigns(resource).merge(owner_assigns(resource.applicant.owner))
       end
@@ -88,6 +102,17 @@ module Effective
       { applicant: values }
     end
 
+    def endorsement_assigns(applicant_endorsement)
+      raise('expected a endorsement') unless applicant_endorsement.kind_of?(Effective::ApplicantEndorsement)
+
+      values = {
+        name: (applicant_endorsement.endorser&.to_s || applicant_endorsement.name),
+        url: effective_memberships.applicant_endorsement_url(applicant_endorsement)
+      }
+
+      { endorsement: values }
+    end
+
     def reference_assigns(applicant_reference)
       raise('expected a reference') unless applicant_reference.kind_of?(Effective::ApplicantReference)
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -93,6 +93,9 @@ module EffectiveMembershipsApplicant
     has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_educations, reject_if: :all_blank, allow_destroy: true
 
+    has_many :applicant_endorsements, -> { order(:id) }, class_name: 'Effective::ApplicantEndorsement', as: :applicant, inverse_of: :applicant, dependent: :destroy
+    accepts_nested_attributes_for :applicant_endorsements, reject_if: :all_blank, allow_destroy: true
+
     has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_experiences, reject_if: :all_blank, allow_destroy: true
 
@@ -238,6 +241,16 @@ module EffectiveMembershipsApplicant
       end
     end
 
+    # Applicant Endorsements Step
+    with_options(if: -> { current_step == :endorsements }) do
+      validate do
+        required = min_applicant_endorsements()
+        existing = applicant_endorsements().reject(&:marked_for_destruction?).length
+
+        self.errors.add(:applicant_endorsements, "please include #{required} or more endorsements") if existing < required
+      end
+    end
+
     # Applicant References Step
     with_options(if: -> { current_step == :references }) do
       validate do
@@ -361,6 +374,7 @@ module EffectiveMembershipsApplicant
       stamps.each { |stamp| stamp.submit! }
 
       after_commit do
+        applicant_endorsements.each { |endorsement| endorsement.notify! if endorsement.submitted? }
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
       end
 
@@ -521,6 +535,11 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_references.to_i
   end
 
+  # Endorsements Step
+  def min_applicant_endorsements
+    category&.min_applicant_endorsements.to_i
+  end
+
   # Files Step
   def min_applicant_files
     category&.min_applicant_files.to_i
@@ -536,6 +555,10 @@ module EffectiveMembershipsApplicant
     )
   end
 
+  def applicant_endorsements_required?
+    min_applicant_endorsements > 0
+  end
+
   def applicant_references_required?
     min_applicant_references > 0
   end
@@ -543,13 +566,18 @@ module EffectiveMembershipsApplicant
   # When an application is submitted, these must be done to go to completed.
   # An Admin can override this and just set them to completed.
   def completed_requirements
-    if category&.applicant_wizard_steps&.include?(:references) || applicant_references_required?
-      {
-        'Applicant References' => (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
-      }
-    else
-      {}
+    requirements = {}
+    return requirements unless category.present?
+
+    if category.applicant_wizard_steps.include?(:references) || applicant_references_required?
+      requirements['Applicant References'] = (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
     end
+
+    if category.applicant_wizard_steps.include?(:endorsements) || applicant_endorsements_required?
+      requirements['Applicant Endorsements'] = (!applicant_endorsements_required? || applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
+    end
+
+    requirements
   end
 
   def complete!

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -129,7 +129,6 @@ module EffectiveMembershipsFeePayment
 
         fee_payment_steps.delete(:organization) unless organization?
 
-
         wizard_steps.select do |step|
           required_steps.include?(step) || category.blank? || fee_payment_steps.include?(step)
         end

data/app/models/concerns/effective_memberships_organization.rb

@@ -62,6 +62,11 @@ module EffectiveMembershipsOrganization
     scope :deep, -> { includes(:representatives) }
     scope :sorted, -> { order(:title) }
 
+    scope :membership_applying, -> {
+      applicants = EffectiveMemberships.Applicant.all
+      without_role(:member).where(id: applicants.select(:organization_id))
+    }
+
     validates :title, presence: true, uniqueness: true
     validates :email, presence: true
   end

data/app/models/concerns/effective_memberships_owner.rb

@@ -37,6 +37,22 @@ module EffectiveMembershipsOwner
     accepts_nested_attributes_for :membership_histories
 
     scope :members, -> { joins(:membership) }
+
+    scope :membership_removed, -> {
+      removed = Effective::MembershipHistory.removed.where(owner_type: name)
+      without_role(:member).where(id: removed.select(:owner_id))
+    }
+
+    scope :membership_bad_standing, -> {
+      bad_standing = Effective::Membership.where(bad_standing: true).where(owner_type: name)
+      where(id: bad_standing.select(:owner_id))
+    }
+
+    scope :membership_renewed_this_period, -> {
+      with_paid_fees_through = Effective::Membership.with_paid_fees_through.where(owner_type: name)
+      where(id: with_paid_fees_through.select(:owner_id))
+    }
+
   end
 
   def assign_member_role
@@ -181,8 +197,8 @@ module EffectiveMembershipsOwner
     # Build the renewal fee
     fee ||= fees.build()
 
-    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period)
-    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period)
+    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
+    bad_standing_on ||= EffectiveMemberships.Registrar.bad_standing_date(period: period) if category.create_bad_standing?
 
     fee.assign_attributes(
       fee_type: 'Renewal',

data/app/models/concerns/effective_memberships_registrar.rb

@@ -284,52 +284,53 @@ module EffectiveMembershipsRegistrar
     retval
   end
 
-
   # This is intended to be run once per day in a rake task
   # rake effective_memberships:create_fees
   # Create Renewal and Late fees
-  def create_fees!(period: nil, late_on: nil, bad_standing_on: nil)
-    # The current period, based on Time.zone.now
+  def create_fees!(period: nil)
     period ||= current_period
-    late_on ||= late_fee_date(period: period)
-    bad_standing_on ||= bad_standing_date(period: period)
+    memberships = Effective::Membership.deep.with_unpaid_fees_through(period)
 
     # Create Renewal Fees
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.categories.select(&:create_renewal_fees?).map do |category|
-        existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
-        next if existing.present? # This might be an existing Prorated fee
+    memberships.find_each { |membership| create_renewal_fees!(membership, period: period) }
+    GC.start
 
-        fee = membership.owner.build_renewal_fee(category: category, period: period, late_on: late_on, bad_standing_on: bad_standing_on)
-        raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
-        next if fee.purchased?
+    # Create Late Fees
+    memberships.find_each { |membership| create_late_fees!(membership, period: period) }
+    GC.start
 
-        puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
+    # Update Membership Status - Assign In Bad Standing
+    memberships.find_each { |membership| update_membership_status!(membership, period: period) }
+    GC.start
 
-        fee.save!
-      end
-    end
+    true
+  end
 
-    GC.start
+  def create_renewal_fees!(membership, period:)
+    membership.categories.select(&:create_renewal_fees?).map do |category|
+      existing = membership.owner.membership_period_fee(category: category, period: period, except: 'Renewal')
+      next if existing.present? # This might be an existing Prorated fee
 
-    # Create Late Fees
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.categories.select(&:create_late_fees?).map do |category|
-        fee = membership.owner.build_late_fee(category: category, period: period)
-        next if fee.blank? || fee.purchased?
+      fee = membership.owner.build_renewal_fee(category: category, period: period)
+      raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
+      next if fee.purchased?
 
-        fee.save!
-      end
-    end
+      puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
 
-    GC.start
+      fee.save!
+    end
+  end
 
-    # Update Membership Status - Assign In Bad Standing
-    Effective::Membership.deep.with_unpaid_fees_through(period).find_each do |membership|
-      membership.owner.update_membership_status!
+  def create_late_fees!(membership, period:)
+    membership.categories.select(&:create_late_fees?).map do |category|
+      fee = membership.owner.build_late_fee(category: category, period: period)
+      next if fee.blank? || fee.purchased?
+      fee.save!
     end
+  end
 
-    true
+  def update_membership_status!(membership, period: nil)
+    membership.owner.update_membership_status!
   end
 
   # Called in the after_purchase of fee payment

data/app/models/concerns/effective_memberships_user.rb

@@ -27,6 +27,11 @@ module EffectiveMembershipsUser
       class_name: 'Effective::Representative', inverse_of: :user, dependent: :delete_all
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
+
+    scope :membership_applying, -> {
+      applicants = EffectiveMemberships.Applicant.all
+      without_role(:member).where(id: applicants.select(:user_id))
+    }
   end
 
   # Instance Methods

data/app/models/effective/applicant_endorsement.rb

@@ -0,0 +1,100 @@
+# An ApplicantEndorsement is similar to a reference, except it must be an existing member
+
+module Effective
+  class ApplicantEndorsement < ActiveRecord::Base
+    acts_as_tokened
+
+    acts_as_statused(
+      :submitted, # Was submitted by the applicant
+      :completed # Was completed by the endorser.
+    )
+
+    log_changes(to: :applicant) if respond_to?(:log_changes)
+
+    belongs_to :applicant, polymorphic: true
+    belongs_to :endorser, polymorphic: true, optional: true
+
+    effective_resource do
+      # These fields are submitted by the applicant
+      # They should try to select an endorser from the dropdown
+      # But we also allow a fallback
+      unknown_member   :boolean
+      endorser_email   :string
+      name             :string
+      phone            :string
+
+      # As per acts_as_statused. For tracking the state machine.
+      status            :string
+      status_steps      :text
+
+      # Endorser Declaration
+      notes                   :text
+      accept_declaration      :boolean
+
+      # Tracking the submission
+      token                     :string
+      last_notified_at          :datetime
+
+      timestamps
+    end
+
+    scope :deep, -> { all }
+
+    # All step validations
+    validates :applicant, presence: true
+    validates :endorser, presence: true, unless: -> { unknown_member? }
+
+    with_options(if: -> { unknown_member? }) do
+      validates :endorser_email, presence: true, email: true
+      validates :name, presence: true
+      validates :phone, presence: true
+    end
+
+    # When being submit by the reference
+    with_options(if: -> { completed? }) do
+      validates :accept_declaration, acceptance: true
+    end
+
+    after_commit(on: :create, if: -> { applicant.was_submitted? }) { notify! }
+
+    def self.endorser_collection(applicant)
+      raise('expected an effective memberships applicant') unless applicant.class.try(:effective_memberships_applicant?)
+
+      collection_method = EffectiveMemberships.applicant_endorsements_endorser_collection()
+
+      if collection_method.blank?
+        return (applicant.user.class.members)
+      end
+
+      collection = instance_exec(applicant, &collection_method)
+
+      unless collection.kind_of?(ActiveRecord::Relation)
+        raise("expected EffectiveMemberships.applicant_endorsements_endorsers_collection to return an ActiveRecord::Relation.")
+      end
+
+      collection
+    end
+
+    def to_s
+      'endorsement'
+    end
+
+    def email
+      endorser&.email || endorser_email
+    end
+
+    def notify!
+      raise('expected endorsement email') unless email.present?
+
+      EffectiveMemberships.send_email(:applicant_endorsement_notification, self)
+      update!(last_notified_at: Time.zone.now)
+    end
+
+    def complete!
+      completed!
+      applicant.save!
+    end
+
+  end
+
+end

data/app/models/effective/membership.rb

@@ -38,8 +38,9 @@ module Effective
     }
 
     scope :with_unpaid_fees_through, -> (period = nil) {
-      where(arel_table[:fees_paid_period].lt(period || EffectiveMemberships.Registrar.current_period))
-      .or(where(fees_paid_period: nil))
+      joined = where(arel_table[:joined_on].lt(period || EffectiveMemberships.Registrar.current_period))
+      unpaid = where(arel_table[:fees_paid_period].lt(period || EffectiveMemberships.Registrar.current_period)).or(where(fees_paid_period: nil))
+      joined.merge(unpaid)
     }
 
     before_validation do
@@ -119,7 +120,24 @@ module Effective
     end
 
     def fees_paid?
-      fees_paid_period == EffectiveMemberships.Registrar.current_period
+      paid_fees_through?(EffectiveMemberships.Registrar.current_period)
+    end
+
+    def paid_fees_through?(period = nil)
+      period ||= EffectiveMemberships.Registrar.current_period
+
+      return false if fees_paid_period.blank?
+      fees_paid_period >= period
+    end
+
+    def unpaid_fees_through?(period = nil)
+      period ||= EffectiveMemberships.Registrar.current_period
+
+      return false if joined_on.blank?
+      return false unless joined_on < period
+
+      return true if fees_paid_period.blank?
+      fees_paid_period < period
     end
 
     def change_fees_paid_period
@@ -127,6 +145,10 @@ module Effective
     end
 
     def change_fees_paid_period=(date)
+      if date.blank?
+        return assign_attributes(fees_paid_period: nil, fees_paid_through_period: nil)
+      end
+
       date = (date.respond_to?(:strftime) ? date : Date.parse(date))
 
       period = EffectiveMemberships.Registrar.period(date: date)
@@ -135,5 +157,20 @@ module Effective
       assign_attributes(fees_paid_period: period, fees_paid_through_period: period_end_on)
     end
 
+    # Admin updating membership info
+    def revise!
+      save!
+
+      period = EffectiveMemberships.Registrar.current_period
+      return true if paid_fees_through?(period)
+
+      # Otherwise build fees right now
+      EffectiveMemberships.Registrar.create_renewal_fees!(self, period: period)
+      EffectiveMemberships.Registrar.create_late_fees!(self, period: period)
+      EffectiveMemberships.Registrar.update_membership_status!(self, period: period)
+
+      true
+    end
+
   end
 end

data/app/models/effective/membership_history.rb

@@ -25,6 +25,8 @@ module Effective
     scope :deep, -> { includes(:owner) }
     scope :sorted, -> { order(:start_on) }
 
+    scope :removed, -> { where(removed: true) }
+
     validates :owner, presence: true
 
     # validates :categories, presence: true, unless: -> { removed? }

data/app/views/admin/applicant_endorsements/_applicant_endorsement.html.haml

@@ -0,0 +1 @@
+= render '/effective/applicant_endorsements/applicant_endorsement', applicant_endorsement: applicant_endorsement, skip_actions: true

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

@@ -25,6 +25,10 @@
     = tab 'References' do
       .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
 
+  - if applicant.applicant_endorsements.present?
+    = tab 'Endorsements' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantEndorsementsDatatable.new(applicant: applicant))
+
   - if applicant.fees.present? || applicant.orders.present?
     = tab 'Fees' do
       .mb-4

data/app/views/admin/categories/_form_applicant_steps.html.haml

@@ -32,6 +32,12 @@
           %td= f.number_field :min_applicant_experiences_months, label: false
           %td minimimum months of work experience
 
+      - if applicant.wizard_step_keys.include?(:endorsements)
+        %tr
+          %td= applicant.wizard_step_title(:endorsements)
+          %td= f.number_field :min_applicant_endorsements, label: false
+          %td minimimum number of endorsements
+
       - if applicant.wizard_step_keys.include?(:references)
         %tr
           %td= applicant.wizard_step_title(:references)

data/app/views/admin/fee_payments/_fee_payment.html.haml

@@ -1 +1,5 @@
+.card
+  .card-body= render 'effective/fee_payments/summary', fee_payment: fee_payment
+
 = render 'effective/fee_payments/fee_payment', fee_payment: fee_payment
+= render 'effective/fee_payments/orders', fee_payment: fee_payment

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

@@ -3,9 +3,8 @@
     = f.hidden_field :owner_id
     = f.hidden_field :owner_type
   - else
-    - raise('todo')
-    - collection = EffectiveMembershipsOwner.descendants.map { |d| [d.name.to_s, d.members.sorted] }.to_h
-    = f.select :owner_id, collection, polymorphic: true
+    - collection = { 'Users' => current_user.class.sorted, 'Organizations' => EffectiveMemberships.Organization.sorted }
+    = f.select :owner, collection, polymorphic: true
 
   - if f.object.new_record?
     = f.select :fee_type, EffectiveMemberships.custom_fee_types

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

@@ -21,7 +21,7 @@
     - periods = registrar.periods(from: f.object.joined_on)
     - collection = periods.reverse.map { |period| [registrar.period_end_on(date: period), period] }
 
-    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Can change how renewal fees are created.'
+    = f.select :change_fees_paid_period, collection, label: 'Fees Paid Through', hint: 'Which period this user has fees paid through. Determines which renewal fees should be created. Setting this to a past or blank period may create a renewal fee in the current period.'
 
     %p.text-muted To update the current membership categories, use the 'Assign' or 'Reclassify' actions below
 

data/app/views/admin/users/_col.html.haml

@@ -0,0 +1,12 @@
+- user = (resource.respond_to?(:email) ? resource : resource.user)
+
+= user.to_s
+
+- if user.email.present?
+  %br
+  = mail_to user.email
+
+- if user.membership.present?
+  %br
+  = '#' + user.membership.number
+  #{user.membership.categories.to_sentence}

data/app/views/effective/applicant_endorsements/_applicant_endorsement.html.haml

@@ -0,0 +1,46 @@
+- endorsement = applicant_endorsement
+
+%table.table.table-sm
+  %tbody
+    %tr
+      %th Endorser
+      %td
+        - if endorsement.endorser.present?
+          - endorser = endorsement.endorser
+          = link_to("#{endorser.to_s} <#{endorser.email}>", "mailto:#{endorser.email}")
+        - else
+          = link_to("#{endorsement.name} <#{endorsement.email}>", "mailto:#{endorsement.email}")
+      %td
+
+    - if endorsement.phone.present?
+      %tr
+        %th Phone
+        %td= endorsement.phone
+
+    - if endorsement.applicant.was_submitted?
+      %tr
+        %th Status
+        %td
+          - if endorsement.submitted?
+            Waiting on response
+          - elsif endorsement.completed?
+            Response completed
+
+    - unless endorsement.applicant.was_approved?
+      %tr
+        %th Last Notified at
+        %td= endorsement.last_notified_at&.strftime('%F') || 'Never'
+
+      - if can?(:notify, endorsement) && !local_assigns[:skip_actions]
+        %tr
+          %th Notification
+          %td= link_to('Resend email notification', effective_memberships.notify_applicant_endorsement_path(endorsement), 'data-method': :post, 'data-confirm': "Really resend email notification to #{endorsement.email}?")
+
+    - if endorsement.completed? && can?(:review, endorsement)
+      %tr
+        %th Notes
+        %td= endorsement.notes
+
+      %tr
+        %th Endorsed On
+        %td= endorsement.completed_at.strftime('%F')

data/app/views/effective/applicant_endorsements/_datatable_actions.html.haml

@@ -0,0 +1,4 @@
+= dropdown(variation: :dropleft) do
+  - unless applicant_endorsement.completed?
+    = dropdown_link_to 'Notify', effective_memberships.notify_applicant_endorsement_path(applicant_endorsement),
+      data: { method: :post, confirm: "Really notify #{applicant_endorsement.email}?" }

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

@@ -0,0 +1,9 @@
+= effective_form_with(model: applicant_endorsement, engine: true) do |f|
+  = f.hidden_field :applicant_id
+  = f.hidden_field :applicant_type
+
+  - if f.object.new_record?
+    %p An email will be sent asking them to complete a endorsement declaration form.
+    = f.submit('Create and Notify endorser')
+  - else
+    = f.submit

data/app/views/effective/applicant_endorsements/_form_declaration.html.haml

@@ -0,0 +1,22 @@
+= effective_form_with(model: applicant_endorsement, engine: true) do |f|
+  %h2 Applicant endorsement
+
+  %p
+    I endorse and sponser
+    = applicant_endorsement.applicant.owner
+    as a candidate for
+    = applicant_endorsement.applicant.category
+    membership and certify that I have personal knowledge of the professional ability
+    and character, methods of practice, and experience of the applicant.
+
+  %p
+    The candidate has satisfied the requirements for membership in this category,
+    and to the best of my personal knowledge,
+    the applicant observes and upholds the Code of Ethics and Professional Practice.
+
+  .mt-4
+
+  = f.text_area :notes, label: "Additional comments"
+  = f.check_box :accept_declaration, label: 'Yes, I declare that the above information is true and accurate'
+
+  = f.submit 'Complete Endorsement'

data/app/views/effective/applicant_endorsements/complete.html.haml

@@ -0,0 +1,3 @@
+.card
+  .card-body
+    %p Thank you! The confidential endorsement has been completed.

data/app/views/effective/applicant_endorsements/edit.html.haml

@@ -0,0 +1,8 @@
+.card
+  .card-body
+    %p
+      Please provide a endorsement for the applicant
+      = succeed('.') do
+        %strong= @applicant_endorsement.applicant.owner
+
+    = render('form_declaration', applicant_endorsement: @applicant_endorsement)

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

@@ -0,0 +1,15 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= applicant.wizard_step_title(:endorsements)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:endorsements)) if edit_effective_wizard?
+
+    - applicant.applicant_endorsements.each_with_index do |applicant_endorsement, index|
+      - if index > 0
+        .mb-4
+
+      %h6 Endorsement ##{index + 1}
+
+      = render('effective/applicant_endorsements/applicant_endorsement', applicant_endorsement: applicant_endorsement)

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

@@ -0,0 +1,25 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  .card
+    .card-body
+      - if resource.min_applicant_endorsements > 0
+        %p You must include #{resource.min_applicant_endorsements} or more endorsements.
+
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.has_many(:applicant_endorsements, cards: true) do |aef|
+          %h4 Endorsement
+
+          = aef.select :endorser, Effective::ApplicantEndorsement.endorser_collection(resource), required: false,
+            ajax_url: effective_memberships.select2_ajax_endorser_applicant_endorsement_path(applicant_id: resource)
+
+          = aef.check_box :unknown_member, label: 'I cant find my endorser in the above list'
+
+          = aef.show_if(:unknown_member, true) do
+            = aef.email_field :endorser_email, required: true
+            = aef.text_field :name, required: true
+            = aef.phone_field :phone, required: true
+
+        = f.save 'Save and Continue'

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

@@ -12,7 +12,7 @@
         = f.error :applicant_experiences_months
 
         = f.has_many(:applicant_experiences, cards: true) do |aef|
-          %h4 Work Experience
+          %h4.mb-4 Work Experience
 
           .row
             .col= aef.text_field :employer

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

@@ -27,9 +27,14 @@
             = f.show_if(:category_id, mc.id) do
               .mb-4
                 %h3= mc.to_s
-                %small.text-muted #{mc.category} #{mc.category_type} Membership
+
+                - 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/fee_payments/_orders.html.haml

@@ -1,4 +1,4 @@
 - if fee_payment.submit_order&.purchased?
   .card.mb-4
     .card-body
-      = render(fee_payment.submit_order)
+      = render('effective/orders/order', order: fee_payment.submit_order)

data/app/views/effective/memberships_mailer/applicant_endorsement_notification.liquid

@@ -0,0 +1,15 @@
+---
+subject: 'Your endorsement has been requested'
+from: 'admin@example.com'
+---
+Hello {{ endorsement.name }},
+
+An applicant, {{ user.name }}, has requested your endorsement.
+
+Would you please complete the endorsement declaration form at this url:
+
+{{ endorsement.url }}
+
+Thank you.
+
+Please contact us for assistance.

data/config/effective_memberships.rb

@@ -24,6 +24,9 @@ EffectiveMemberships.setup do |config|
   # The defaults include: Applicant, Prorated, Renewal, Late, Admin
   # config.additional_fee_types = []
 
+  # Applicant Endorsements
+  # config.applicant_endorsements_endorser_collection = Proc.new { |applicant| applicant.user.class.members }
+
   # Applicant Reviews
   # When true, display the reviewed state and require Category.min_applicant_reviews
   # When false, hide the reviewed state entirely

data/config/routes.rb

@@ -9,6 +9,11 @@ EffectiveMemberships::Engine.routes.draw do
       resources :build, controller: :applicants, only: [:show, :update]
     end
 
+    resources :applicant_endorsements, only: [:new, :create, :show, :update] do
+      get :select2_ajax_endorser, on: :member
+      post :notify, on: :member
+    end
+
     resources :applicant_references, only: [:new, :create, :show, :update] do
       post :notify, on: :member
     end
@@ -32,6 +37,10 @@ EffectiveMemberships::Engine.routes.draw do
   namespace :admin do
     resources :applicants, except: [:new, :create, :show]
 
+    resources :applicant_endorsements do
+      post :notify, on: :member
+    end
+
     resources :applicant_references do
       post :notify, on: :member
     end

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

@@ -24,6 +24,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :min_applicant_educations
       t.integer :min_applicant_experiences_months
       t.integer :min_applicant_references
+      t.integer :min_applicant_endorsements
       t.integer :min_applicant_courses
       t.integer :min_applicant_files
 
@@ -295,6 +296,35 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :applicant_references, :applicant_id
     add_index :applicant_references, :token
 
+    # Applicant Endorsements
+    create_table :applicant_endorsements do |t|
+      t.integer :applicant_id
+      t.string :applicant_type
+
+      t.integer :endorser_id
+      t.string :endorser_type
+
+      t.boolean :unknown_member, default: false
+      t.string :endorser_email
+      t.string :name
+      t.string :phone
+
+      t.string :status
+      t.text :status_steps
+
+      t.text :notes
+      t.boolean :accept_declaration
+
+      t.string :token
+      t.datetime :last_notified_at
+
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    add_index :applicant_endorsements, :applicant_id
+    add_index :applicant_endorsements, :token
+
     # Applicant Courses
     create_table :applicant_course_areas do |t|
       t.string :title

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.7'
+  VERSION = '0.4.10'
 end

data/lib/effective_memberships.rb

@@ -8,7 +8,7 @@ module EffectiveMemberships
     [
       :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name,
       :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
-      :additional_fee_types, :applicant_reviews,
+      :additional_fee_types, :applicant_reviews, :applicant_endorsements_endorser_collection,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +256,7 @@ files:
 - app/assets/stylesheets/effective_memberships/base.scss
 - app/controllers/admin/applicant_course_areas_controller.rb
 - app/controllers/admin/applicant_course_names_controller.rb
+- app/controllers/admin/applicant_endorsements_controller.rb
 - app/controllers/admin/applicant_references_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
@@ -252,6 +267,7 @@ files:
 - app/controllers/admin/organizations_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
 - app/controllers/admin/representatives_controller.rb
+- app/controllers/effective/applicant_endorsements_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
@@ -261,6 +277,7 @@ files:
 - app/controllers/effective/representatives_controller.rb
 - app/datatables/admin/effective_applicant_course_areas_datatable.rb
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
+- app/datatables/admin/effective_applicant_endorsements_datatable.rb
 - app/datatables/admin/effective_applicant_references_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
@@ -272,6 +289,7 @@ files:
 - app/datatables/admin/effective_representatives_datatable.rb
 - 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_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
@@ -295,6 +313,7 @@ files:
 - app/models/effective/applicant_course_area.rb
 - app/models/effective/applicant_course_name.rb
 - app/models/effective/applicant_education.rb
+- app/models/effective/applicant_endorsement.rb
 - app/models/effective/applicant_experience.rb
 - app/models/effective/applicant_reference.rb
 - app/models/effective/applicant_review.rb
@@ -313,6 +332,7 @@ files:
 - app/views/admin/applicant_course_areas/_form_applicant_course_area.html.haml
 - app/views/admin/applicant_course_areas/index.html.haml
 - app/views/admin/applicant_course_name/_form.html.haml
+- app/views/admin/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/admin/applicant_references/_applicant_reference.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_approve.html.haml
@@ -352,6 +372,13 @@ files:
 - app/views/admin/registrar_actions/_form_remove.html.haml
 - app/views/admin/representatives/_form.html.haml
 - app/views/admin/representatives/_user_fields.html.haml
+- app/views/admin/users/_col.html.haml
+- app/views/effective/applicant_endorsements/_applicant_endorsement.html.haml
+- app/views/effective/applicant_endorsements/_datatable_actions.html.haml
+- app/views/effective/applicant_endorsements/_form.html.haml
+- 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_references/_applicant_reference.html.haml
 - app/views/effective/applicant_references/_datatable_actions.html.haml
 - app/views/effective/applicant_references/_form.html.haml
@@ -365,6 +392,7 @@ files:
 - app/views/effective/applicants/_declarations.html.haml
 - app/views/effective/applicants/_demographics.html.haml
 - app/views/effective/applicants/_education.html.haml
+- app/views/effective/applicants/_endorsements.html.haml
 - app/views/effective/applicants/_experience.html.haml
 - app/views/effective/applicants/_files.html.haml
 - app/views/effective/applicants/_layout.html.haml
@@ -382,6 +410,7 @@ files:
 - app/views/effective/applicants/declarations.html.haml
 - app/views/effective/applicants/demographics.html.haml
 - app/views/effective/applicants/education.html.haml
+- app/views/effective/applicants/endorsements.html.haml
 - app/views/effective/applicants/experience.html.haml
 - app/views/effective/applicants/files.html.haml
 - app/views/effective/applicants/organization.html.haml
@@ -417,6 +446,7 @@ files:
 - app/views/effective/memberships_mailer/applicant_approved.liquid
 - app/views/effective/memberships_mailer/applicant_completed.liquid
 - app/views/effective/memberships_mailer/applicant_declined.liquid
+- app/views/effective/memberships_mailer/applicant_endorsement_notification.liquid
 - app/views/effective/memberships_mailer/applicant_missing_info.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid
 - app/views/effective/organizations/_dashboard.html.haml