effective_memberships 0.3.8 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5429d3c4c93088302ef65577a3f97649d2bb56191f701a5475f41973860ad21
-  data.tar.gz: 276b0b0d68ebf151cf67d8f542105b656688b1bf4969c5047c13c1667d364dca
+  metadata.gz: 8200c84934681ed1e13ce23e75bf061f58e0f83f4549be02de3efdadf4f31c6e
+  data.tar.gz: e09fda17565f145d34ccc7c18674159b943170a150a6798da453884fecc61372
 SHA512:
-  metadata.gz: 5b1c53a8c3cec9712413f4d2c8f58786db72d8e2a12da1f40920fa39ffae3162e67c9782c72bf290ec91b1a29e3aa93374b0c09cb09dafda6151803aec93d578
-  data.tar.gz: f7bb8c97dbbc5c4f45f6c8b60cc4979fc4de32822b06f4a930a69fc6e7844fba015bf2dd9fa5a4038e885ab6353497cee7a1db0aafb1ec20c561389255315fd1
+  metadata.gz: 15f1850e5b6aa9cc4124f49a1dd2ea8599222d2fbe54053d63b5bcc6171a3abfd9f551932d72eef79232024d7a04b93390c16fed8a57836e04ea3fea85011511
+  data.tar.gz: 4a317ace51abee560000072f05426b38175900a56a2f0c31eede63207fa3b4edf6845608093b1d77eb47c9118c7f641031e68806e2b96c76b9f4edba6525440d

data/app/controllers/admin/applicants_controller.rb

@@ -8,6 +8,20 @@ module Admin
     resource_scope -> { EffectiveMemberships.Applicant.deep.all }
     datatable -> { Admin::EffectiveApplicantsDatatable.new }
 
+    submit :complete, 'Complete Applicant', success: -> {
+      [
+        "Successfully completed #{resource.owner} #{resource}",
+        ("and sent #{resource.owner.email} a notification" unless resource.email_form_skip)
+      ].compact.join(' ')
+    }
+
+    submit :missing, 'Missing Info Applicant', success: -> {
+      [
+        "Successfully marked #{resource.owner} #{resource} as missing info",
+        ("and sent #{resource.owner.email} a notification" unless resource.email_form_skip)
+      ].compact.join(' ')
+    }
+
     submit :approve, 'Approve Applicant', success: -> {
       [
         "Successfully approved #{resource.owner} #{resource}",

data/app/controllers/effective/applicants_controller.rb

@@ -6,5 +6,7 @@ module Effective
 
     resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners) }
 
+    submit :resubmit, 'Submit Application'
+
   end
 end

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -1,23 +1,29 @@
 module Admin
   class EffectiveApplicantsDatatable < Effective::Datatable
     filters do
-      scope :all
+      scope :not_draft, label: 'All'
       scope :in_progress, label: 'Open / Active'
       scope :done, label: 'Done'
+      scope :draft
     end
 
     datatable do
       order :id
       col :id, visible: false
 
-      col :status
+      col :status, search: effective_memberships_status_collection()
 
       col :created_at, label: 'Created', as: :date, visible: false
       col :updated_at, label: 'Updated', visible: false
 
       col :submitted_at, label: 'Submitted', visible: false, as: :date
       col :completed_at, label: 'Completed', visible: false, as: :date
-      col :reviewed_at, label: 'Reviewed', visible: false, as: :date
+      col :missing_info_at, label: 'Missing Info', visible: false, as: :date
+
+      if EffectiveMemberships.applicant_reviews?
+        col :reviewed_at, label: 'Reviewed', visible: false, as: :date
+      end
+
       col :approved_at, label: 'Approved', visible: false, as: :date
 
       col :owner

data/app/datatables/admin/effective_fees_datatable.rb

@@ -33,7 +33,9 @@ module Admin
 
       col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
 
-      aggregate :total
+      unless attributes[:total] == false
+        aggregate :total
+      end
 
       if attributes[:applicant_id]
         actions_col(new: false)
@@ -63,11 +65,11 @@ module Admin
     end
 
     def applicant
-      @applicant ||= EffectiveMemberships.Applicant.find(attributes[:applicant_id])
+      @applicant ||= EffectiveMemberships.Applicant.where(id: attributes[:applicant_id]).first!
     end
 
     def fee_payment
-      @fee_payment ||= EffectiveMemberships.FeePayment.find(attributes[:fee_payment_id])
+      @fee_payment ||= EffectiveMemberships.FeePayment.where(id: attributes[:fee_payment_id]).first!
     end
 
   end

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -24,11 +24,48 @@ module Admin
       col :bad_standing_admin, visible: false
       col :bad_standing_reason, visible: false
 
+      col :email do |membership|
+        email = membership.owner.try(:email)
+        mail_to(email) if email.present?
+      end
+
+      col :phone do |membership|
+        membership.owner.try(:phone) || membership.owner.try(:home_phone) || membership.owner.try(:cell_phone)
+      end
+
+      col :address do |membership|
+        membership.owner.try(:addresses).try(:first).try(:to_html)
+      end
+
+      col :address1, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:address1)
+      end
+
+      col :address2, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:address2)
+      end
+
+      col :city, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:city)
+      end
+
+      col :province, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:province)
+      end
+
+      col :country, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:country)
+      end
+
+      col :postal_code, visible: false do |membership|
+        membership.owner.try(:addresses).try(:first).try(:postal_code)
+      end
+
       actions_col
     end
 
     collection do
-      memberships = Effective::Membership.deep.all.includes(:owner)
+      memberships = Effective::Membership.deep.all.includes(owner: :addresses)
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 

data/app/datatables/effective_applicants_datatable.rb

@@ -6,14 +6,20 @@ class EffectiveApplicantsDatatable < Effective::Datatable
     col :id, visible: false
 
     col :category, label: 'Category'
-    col :status
+    col :status, search: effective_memberships_status_collection()
 
     col :created_at, label: 'Created', as: :date
     col :updated_at, label: 'Updated', as: :date, visible: false
+
     col :submitted_at, label: 'Submitted', as: :date
-    col :completed_at, label: 'Completed', as: :date
-    col :reviewed_at, label: 'Reviewed', as: :date
-    col :approved_at, label: 'Approved', visible: false, as: :date
+    col :completed_at, label: 'Completed', as: :date, visible: false
+    col :missing_info_at, label: 'Missing Info', as: :date, visible: false
+
+    if EffectiveMemberships.applicant_reviews?
+      col :reviewed_at, label: 'Reviewed', as: :date
+    end
+
+    col :approved_at, label: 'Approved', as: :date
 
     col :orders
 

data/app/datatables/effective_memberships_directory_datatable.rb

@@ -11,7 +11,7 @@ class EffectiveMembershipsDirectoryDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Membership.deep.includes(:owner)
+    scope = Effective::Membership.deep.good_standing.includes(:owner)
 
     archived_klasses.each do |klass|
       scope = scope.where.not(owner_id: klass.archived.select('id'), owner_type: klass.name)

data/app/helpers/effective_memberships_helper.rb

@@ -1,2 +1,11 @@
 module EffectiveMembershipsHelper
+
+  def effective_memberships_status_collection
+    EffectiveMemberships.Applicant::STATUSES.map do |status|
+      next if status == :reviewed && !EffectiveMemberships.applicant_reviews?
+
+      [status.to_s.gsub('_', ' '), status]
+    end.compact
+  end
+
 end

data/app/mailers/effective/memberships_mailer.rb

@@ -5,14 +5,24 @@ module Effective
     default from: -> { EffectiveMemberships.mailer_sender }
     layout -> { EffectiveMemberships.mailer_layout || 'effective_memberships_mailer_layout' }
 
+    def applicant_completed(resource, opts = {})
+      @assigns = assigns_for(resource)
+      mail(to: resource.owner.email, **headers_for(resource, opts))
+    end
+
+    def applicant_missing_info(resource, opts = {})
+      @assigns = assigns_for(resource)
+      mail(to: resource.owner.email, **headers_for(resource, opts))
+    end
+
     def applicant_approved(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: EffectiveMemberships.mailer_admin, **headers_for(resource, opts))
+      mail(to: resource.owner.email, **headers_for(resource, opts))
     end
 
     def applicant_declined(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: EffectiveMemberships.mailer_admin, **headers_for(resource, opts))
+      mail(to: resource.owner.email, **headers_for(resource, opts))
     end
 
     def applicant_reference_notification(resource, opts = {})
@@ -49,11 +59,11 @@ module Effective
 
         url: effective_memberships.applicant_url(applicant),
         admin_url: effective_memberships.edit_admin_applicant_url(applicant),
-      }
 
-      if applicant.declined_reason.present?
-        values.merge!(declined_reason: applicant.declined_reason)
-      end
+        # Optional
+        declined_reason: applicant.declined_reason.presence,
+        missing_info_reason: applicant.missing_info_reason.presence
+      }.compact
 
       { applicant: values }
     end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -32,12 +32,13 @@ module EffectiveMembershipsApplicant
     acts_as_tokened
 
     acts_as_statused(
-      :draft,       # Just Started
-      :submitted,   # Completed wizard. Paid applicant fee.
-      :completed,   # Admin has received all deliverables. The application is complete and ready for review.
-      :reviewed,    # All applicant reviews completed
-      :declined,    # Exit state. Application was declined.
-      :approved     # Exit state. Application was approved.
+      :draft,         # Just Started
+      :submitted,     # Completed wizard. Paid applicant fee.
+      :missing_info,  # Admin has indicated information is missing. The applicant can edit applicant and add info
+      :completed,     # Admin has received all deliverables. The application is complete and ready for review.
+      :reviewed,      # All applicant reviews completed
+      :declined,      # Exit state. Application was declined.
+      :approved       # Exit state. Application was approved.
     )
 
     acts_as_wizard(
@@ -49,6 +50,7 @@ module EffectiveMembershipsApplicant
       experience: 'Work Experience',
       references: 'References',
       files: 'Attach Files',
+      stamp: 'Professional Stamp',
       declarations: 'Declarations',
       summary: 'Review',
       billing: 'Billing Address',
@@ -93,10 +95,14 @@ module EffectiveMembershipsApplicant
     has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', as: :applicant, inverse_of: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_references, reject_if: :all_blank, allow_destroy: true
 
-    has_many :fees, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Fee', dependent: :nullify
+    has_many :stamps, -> { order(:id) }, class_name: 'Effective::Stamp', as: :applicant, inverse_of: :applicant, dependent: :destroy
+    accepts_nested_attributes_for :stamps, reject_if: :all_blank, allow_destroy: true
+
+    # Effective Namespace polymorphic
+    has_many :fees, -> { order(:id) }, class_name: 'Effective::Fee', as: :parent, inverse_of: :parent, dependent: :destroy
     accepts_nested_attributes_for :fees, reject_if: :all_blank, allow_destroy: true
 
-    has_many :orders, -> { order(:id) }, as: :parent, inverse_of: :parent, class_name: 'Effective::Order', dependent: :nullify
+    has_many :orders, -> { order(:id) }, class_name: 'Effective::Order', as: :parent, inverse_of: :parent, dependent: :destroy
     accepts_nested_attributes_for :orders
 
     effective_resource do
@@ -116,18 +122,22 @@ module EffectiveMembershipsApplicant
       declined_at            :datetime
       declined_reason        :text
 
+      # Missing Info
+      missing_info_at        :datetime
+      missing_info_reason    :text
+
       # Applicant Educations
-      applicant_educations_details  :text
+      applicant_educations_details    :text
 
       # Applicant Experiences
-      applicant_experiences_months   :integer
-      applicant_experiences_details  :text
+      applicant_experiences_months    :integer
+      applicant_experiences_details   :text
 
       # Additional Information
-      additional_information         :text
+      additional_information          :text
 
       # Acts as Wizard
-      wizard_steps           :text, permitted: false
+      wizard_steps                    :text, permitted: false
 
       timestamps
     end
@@ -138,6 +148,8 @@ module EffectiveMembershipsApplicant
     scope :in_progress, -> { where.not(status: [:approved, :declined]) }
     scope :done, -> { where(status: [:approved, :declined]) }
 
+    scope :not_draft, -> { where.not(status: :draft) }
+
     # Set Apply to Join or Reclassification
     before_validation(if: -> { new_record? && owner.present? }) do
       self.applicant_type ||= (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
@@ -257,9 +269,12 @@ module EffectiveMembershipsApplicant
     # Admin Decline
     validates :declined_reason, presence: true, if: -> { declined? }
 
+    # Admin Missing Info
+    validates :missing_info_reason, presence: true, if: -> { missing_info? }
+
     # These two try completed and try reviewed
-    before_save(if: -> { submitted? }) { complete! }
-    before_save(if: -> { completed? }) { review! }
+    # before_save(if: -> { submitted? }) { complete! }
+    # before_save(if: -> { completed? }) { review! }
 
     # Clear required steps memoization
     after_save { @_required_steps = nil }
@@ -274,38 +289,49 @@ module EffectiveMembershipsApplicant
 
         applicant_steps = Array(category&.applicant_wizard_steps)
 
+        # Special logic for stamp step
+        applicant_steps.delete(:stamp) unless apply_to_join?
+
         wizard_steps.select do |step|
           required_steps.include?(step) || category.blank? || applicant_steps.include?(step)
         end
       end
     end
 
-    # All Fees and Orders
-    def submit_fees
-      fees.select { |fee| fee.applicant_submit_fee? }
-    end
+    def can_visit_step?(step)
+      if missing_info?
+        return [:start, :select, :billing, :checkout].exclude?(step)
+      end
 
-    def submit_order
-      orders.find { |order| order.purchasables.any?(&:applicant_submit_fee?) }
+      can_revisit_completed_steps(step)
     end
 
-    def submit_fee_qb_item_name
-      'Applicant'
-    end
+    # All Fees and Orders
+    def submit_fees
+      # Find or build submit fee
+      fee = fees.first || fees.build(owner: owner, fee_type: 'Applicant')
+
+      unless fee.purchased?
+        fee.assign_attributes(
+          category: category,
+          price: category.applicant_fee,
+          tax_exempt: category.applicant_fee_tax_exempt,
+          qb_item_name: category.applicant_fee_qb_item_name
+        )
+      end
 
-    def find_or_build_submit_fees
-      return submit_fees if submit_fees.present?
+      # Update stamp price
+      stamp = stamps.first
 
-      fees.build(
-        owner: owner,
-        fee_type: 'Applicant',
-        category: category,
-        price: category.applicant_fee,
-        tax_exempt: category.tax_exempt,
-        qb_item_name: submit_fee_qb_item_name()
-      )
+      if stamp.present? && !stamp.purchased?
+        stamp.assign_attributes(
+          price: category.stamp_fee,
+          tax_exempt: category.stamp_fee_tax_exempt,
+          qb_item_name: category.stamp_fee_qb_item_name
+        )
+      end
 
-      submit_fees
+      (fees + stamps)
     end
 
     # Draft -> Submitted requirements
@@ -315,7 +341,9 @@ module EffectiveMembershipsApplicant
 
       wizard_steps[:checkout] ||= Time.zone.now
       wizard_steps[:submitted] = Time.zone.now
+
       submitted!
+      stamps.each { |stamp| stamp.submit! }
 
       after_commit do
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
@@ -362,6 +390,10 @@ module EffectiveMembershipsApplicant
     approved? || declined?
   end
 
+  def status_label
+    (status_was || status).to_s.gsub('_', ' ')
+  end
+
   def summary
     case status_was
     when 'draft'
@@ -376,6 +408,8 @@ module EffectiveMembershipsApplicant
       else
         "This application has been completed and is now ready for an admin to approve or decline it. If approved, prorated fees will be generated."
       end
+    when 'missing_info'
+      "Missing the following information: <ul><li>#{missing_info_reason}</li></ul>"
     when 'reviewed'
       "This application has been reviewed and is now ready for an admin to approve or decline it. If approved, prorated fees will be generated."
     when 'approved'
@@ -410,10 +444,6 @@ module EffectiveMembershipsApplicant
     # Reset the progress so far. They have to click through screens again.
     assign_attributes(wizard_steps: wizard_steps.slice(:start, :select))
 
-    # Delete any fees and orders. Keep all other data.
-    submit_fees.each { |fee| fee.mark_for_destruction }
-    submit_order.mark_for_destruction if submit_order
-
     save!
   end
 
@@ -463,6 +493,16 @@ module EffectiveMembershipsApplicant
     category&.min_applicant_files.to_i
   end
 
+  # Stamps step
+  def stamp
+    stamps.first || stamps.build(
+      owner: owner,
+      name: owner.to_s,
+      shipping_address: (owner.try(:shipping_address) || owner.try(:billing_address)),
+      price: 0
+    )
+  end
+
   # The submit! method used to be here
   # But it needs to be inside the included do block
   # So see above. Sorry.
@@ -471,7 +511,8 @@ module EffectiveMembershipsApplicant
     min_applicant_references > 0
   end
 
-  # When an application is submitted, these must be done to go to completed
+  # 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
     {
       'Applicant References' => (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
@@ -479,9 +520,34 @@ module EffectiveMembershipsApplicant
   end
 
   def complete!
-    return false unless submitted? && completed_requirements.values.all?
-    # Could send registrar an email here saying this applicant is ready to review
+    raise('applicant must have been submitted to complete!') unless was_submitted?
+
+    # Let an admin ignore these requirements if need be
+    # return false unless submitted? && completed_requirements.values.all?
+
+    assign_attributes(missing_info_reason: nil)
     completed!
+
+    after_commit { send_email(:applicant_completed) }
+    true
+  end
+
+  def missing!
+    raise('applicant must have been submitted to missing!') unless was_submitted?
+
+    missing_info!
+
+    after_commit { send_email(:applicant_missing_info) }
+    true
+  end
+
+  def resubmit!
+    raise('applicant must have been submitted and missing info to resubmit!') unless was_submitted? && was_missing_info?
+    raise('already submitted') if submitted?
+    raise('expected a purchased order') unless submit_order&.purchased?
+
+    assign_attributes(skip_to_step: :submitted, submitted_at: Time.zone.now)
+    submitted!
   end
 
   # Completed -> Reviewed requirements
@@ -494,6 +560,7 @@ module EffectiveMembershipsApplicant
   end
 
   # When an application is completed, these must be done to go to reviewed
+  # An Admin can override this and just set them to reviewed.
   def reviewed_requirements
     {
       'Applicant Reviews' => (!applicant_reviews_required? || applicant_reviews.count(&:completed?) >= min_applicant_reviews)
@@ -501,8 +568,10 @@ module EffectiveMembershipsApplicant
   end
 
   def review!
-    return false unless completed? && reviewed_requirements.values.all?
-    # Could send registrar an email here saying this applicant is ready to approve
+    raise('applicant must have been submitted to review!') unless was_submitted?
+
+    # Let an admin ignore these requirements if need be
+    # return false unless completed? && reviewed_requirements.values.all?
     reviewed!
   end
 
@@ -514,6 +583,8 @@ module EffectiveMembershipsApplicant
     # Complete the wizard step. Just incase this is run out of order.
     wizard_steps[:checkout] ||= Time.zone.now
     wizard_steps[:submitted] ||= Time.zone.now
+    assign_attributes(missing_info_reason: nil)
+
     approved!
 
     if apply_to_join?

data/app/models/concerns/effective_memberships_category.rb

@@ -180,7 +180,7 @@ module EffectiveMembershipsCategory
   end
 
   def applicant_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps
+    wizard_steps = EffectiveMemberships.Applicant.wizard_steps_hash
     required_steps = EffectiveMemberships.Applicant.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -189,7 +189,7 @@ module EffectiveMembershipsCategory
   end
 
   def fee_payment_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps
+    wizard_steps = EffectiveMemberships.FeePayment.wizard_steps_hash
     required_steps = EffectiveMemberships.FeePayment.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -197,4 +197,24 @@ module EffectiveMembershipsCategory
     end
   end
 
+  def applicant_fee_qb_item_name
+    'Applicant'
+  end
+
+  def applicant_fee_tax_exempt
+    tax_exempt
+  end
+
+  def stamp_fee
+    0
+  end
+
+  def stamp_fee_qb_item_name
+    qb_item_name
+  end
+
+  def stamp_fee_tax_exempt
+    tax_exempt
+  end
+
 end

data/app/models/effective/applicant_reference.rb

@@ -2,7 +2,12 @@ module Effective
   class ApplicantReference < ActiveRecord::Base
     acts_as_tokened
     acts_as_addressable :reference
-    acts_as_statused :submitted, :completed
+
+    acts_as_statused(
+      :submitted, # Was submitted by the applicant
+      :completed # Was completed by the reference.
+    )
+
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
     belongs_to :applicant, polymorphic: true

data/app/models/effective/membership.rb

@@ -29,6 +29,8 @@ module Effective
     scope :deep, -> { includes(membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
+    scope :good_standing, -> { where(bad_standing: [nil, false]) }
+
     scope :with_paid_fees_through, -> (period = nil) {
       where(arel_table[:fees_paid_period].gteq(period || EffectiveMemberships.Registrar.current_period))
     }

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

@@ -25,17 +25,21 @@
     = tab 'References' do
       .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
 
-  - if applicant.fees.present?
+  - if applicant.fees.present? || applicant.orders.present?
     = tab 'Fees' do
-      .mb-4= render_inline_datatable(Admin::EffectiveFeesDatatable.new(applicant_id: applicant.to_param))
+      .mb-4
+        %h2 Fees
+        - datatable = Admin::EffectiveFeesDatatable.new(applicant: applicant, total: false)
+        = render_datatable(datatable, simple: true, inline: true)
 
-  - if applicant.orders.present?
-    = tab 'Orders' do
-      .mb-4= render_datatable(Admin::EffectiveOrdersDatatable.new(parent_id: applicant.id, parent_type: EffectiveMemberships.Applicant.name, owner_id: applicant.owner_id, user_type: applicant.owner_type))
+      .mb-4
+        %h2 Orders
+        - datatable = Admin::EffectiveOrdersDatatable.new(parent: applicant, owner: applicant.owner, user: applicant.owner, total: false)
+        = render_datatable(datatable, simple: true)
 
   - if applicant.owner.applicants.any? { |other| other.was_submitted? && other.id != applicant.id }
     = tab 'Other Applications' do
-      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner_id: applicant.owner_id, except_id: applicant.id))
+      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner: applicant.owner, except_id: applicant.id))
 
   - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
     = tab 'Logs' do

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

@@ -1,13 +1,9 @@
 = effective_form_with(model: [:admin, applicant], engine: true) do |f|
-  %p The #{applicant} will be <strong>approved</strong> to the following membership category.
-
-  %h3 Category
-  = f.static_field :category, label: 'Applied for'
+  %p The #{applicant} will be <strong>approved</strong> to the following membership category:
 
   - categories = EffectiveMemberships.Category.all
   = f.select :category_id, categories, label: 'Approve to'
 
-  %h3 Number
   %p
     - if applicant.owner.membership&.number_was.present?
       The member will keep their existing membership number: #{applicant.owner.membership.number}.

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

@@ -0,0 +1,8 @@
+= effective_form_with(model: [:admin, applicant], engine: true) do |f|
+  %p The #{applicant} will be <strong>completed</strong>. All deliverables have been received and all requirements completed.
+
+  %h3 Email to send
+  %p The following email will be sent:
+  = email_form_fields(f, :applicant_completed)
+
+  = f.submit 'Complete Applicant', border: false, center: true, 'data-confirm': "Complete #{f.object.owner}?"

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

@@ -0,0 +1,11 @@
+= effective_form_with(model: [:admin, applicant], engine: true) do |f|
+  %p This applicant will be marked as <strong>missing information</strong> with the following:
+
+  = f.text_field :missing_info_reason, required: true, label: 'Explanation of missing info'
+
+  %h3 Email to send
+
+  %p The following email will be sent:
+  = email_form_fields(f, :applicant_missing_info)
+
+  = f.submit 'Missing Info Applicant', border: false, center: true, 'data-confirm': "Missing Info #{f.object.owner}?"

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

@@ -1,18 +1,22 @@
 %p
-  %span.badge.badge-secondary= applicant.status
+  %span.badge.badge-secondary= applicant.status_label
   = applicant.summary
 
-= tabs(list: { class: 'nav nav-pills'}) do
+%p Process applicant:
+
+= accordion do
+  - if EffectiveResources.authorized?(self, :complete, applicant)
+    = collapse 'Complete this Applicant' do
+      = render('admin/applicants/form_complete', applicant: applicant)
+
+  - if EffectiveResources.authorized?(self, :missing, applicant)
+    = collapse 'Missing Information' do
+      = render('admin/applicants/form_missing_info', applicant: applicant)
+
   - if EffectiveResources.authorized?(self, :approve, applicant)
-    = tab 'Approve this Applicant' do
-      .card.mt-4
-        .card-body
-          %h5.card-title Approve
-          = render('admin/applicants/form_approve', applicant: applicant)
+    = collapse 'Approve this Applicant' do
+      = render('admin/applicants/form_approve', applicant: applicant)
 
   - if EffectiveResources.authorized?(self, :decline, applicant)
-    = tab 'Decline this Applicant' do
-      .card.mt-4
-        .card-body
-          %h5.card-title Decline
-          = render('admin/applicants/form_decline', applicant: applicant)
+    = collapse 'Decline this Applicant' do
+      = render('admin/applicants/form_decline', applicant: applicant)

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

@@ -1,5 +1,5 @@
 %p
-  %span.badge.badge-secondary= applicant.status_was
+  %span.badge.badge-secondary= applicant.status_label
   = applicant.summary
 
 %table.table.table-sm.table-striped
@@ -11,6 +11,8 @@
       %th
         - # Next action button
   %tbody
+
+    -# Draft
     %tr
       %td In Progress
       %td= applicant.created_at.strftime('%F')
@@ -21,6 +23,8 @@
         - else
           = '-'
       %td
+
+    - # Submitted
     %tr
       %td Application Submitted
       %td= applicant.submitted_at&.strftime('%F') || '-'
@@ -30,6 +34,8 @@
         - else
           = '-'
       %td
+
+    - # Waiting to Complete
     %tr
       %td Waiting to Complete
       %td= applicant.submitted_at&.strftime('%F') || '-'
@@ -63,71 +69,83 @@
             References Not Required
 
       %td
-        -# - if !applicant.was_approved? && applicant.transcripts_required? && !applicant.transcripts_approved?
-        -#   = link_to 'Process Transcripts', '#transcripts', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
+        - if applicant.submitted?
+          = link_to 'Complete Applicant', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
 
-        -# - if !applicant.was_approved? && applicant.nwpta_form_required? && !applicant.nwpta_form_received?
-        -#   = link_to 'Receive NWPTA Form', '#nwpta-verification-form', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
+    - # Missing Information
+    %tr
+      %td Missing Information
+      %td= applicant.missing_info_at&.strftime('%F') || '-'
+      %td= applicant.missing_info_reason
+      %td
 
+    - # Completed
     %tr
-      %td Application Complete
+      %td Application Completed
       %td= applicant.completed_at&.strftime('%F') || '-'
       %td
+        - if applicant.completed_at.present?
+          = icon('check', class: 'small-1')
+          Done
       %td
 
-    %tr
-      %td Reviews
-      %td= applicant.reviewed_at&.strftime('%F') || '-'
-      %td
-        - applicant.reviewed_requirements.each do |requirement, completed|
-          - next if requirement.to_s == 'Applicant Reviews'
+    - # Reviewed
+    - if EffectiveMemberships.applicant_reviews?
+      %tr.effective-memberships-applicant-status-reviewed
+        %td Reviews
+        %td= applicant.reviewed_at&.strftime('%F') || '-'
+        %td
+          - applicant.reviewed_requirements.each do |requirement, completed|
+            - next if requirement.to_s == 'Applicant Reviews'
 
-          %p
-            = icon((completed ? 'check' : 'x'), class: 'small-1')
-            = requirement
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              = requirement
 
-        - if applicant.applicant_reviews_required?
-          %p
-            - if applicant.reviewed_requirements['Applicant Reviews']
+          - if applicant.applicant_reviews_required?
+            %p
+              - if applicant.reviewed_requirements['Applicant Reviews']
+                = icon('check', class: 'small-1')
+
+              = applicant.applicant_reviews.count(&:completed?)
+              = '/'
+              = applicant.min_applicant_reviews
+              Reviews Completed
+          - else
+            %p
               = icon('check', class: 'small-1')
+              Reviews Not Required
 
-            = applicant.applicant_reviews.count(&:completed?)
-            = '/'
-            = applicant.min_applicant_reviews
-            Reviews Completed
-        - else
-          %p
-            = icon('check', class: 'small-1')
-            Reviews Not Required
+        %td
+          - # Button to create reviews here
 
+    %tr
+      %td Waiting to Process
       %td
-        - if applicant.was_reviewed? && !applicant.was_approved?
+        - if EffectiveMemberships.applicant_reviews?
+          = applicant.reviewed_at&.strftime('%F') || '-'
+        - else
+          = applicant.completed_at&.strftime('%F') || '-'
+      %td
+      %td
+        - if applicant.was_submitted? && !(applicant.approved? || applicant.declined?)
           = link_to 'Process Applicant', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
 
-    - if applicant.declined_at.present?
-      %tr
-        %td Processed
-        %td= applicant.declined_at.strftime('%F')
-        %td
+    %tr
+      %td Processed
+      %td= (applicant.approved_at&.strftime('%F') || applicant.declined_at&.strftime('%F') || '-')
+      %td
+        - if applicant.was_approved? && !applicant.approved?
+          = icon('check', class: 'small-1')
+          Approved
+
+        - elsif applicant.was_declined? || applicant.declined?
           = icon('check', class: 'small-1')
           Declined
           %br
           = applicant.declined_reason
-        %td
 
-    - if applicant.was_approved?
-      %tr
-        %td Processed
-        %td= applicant.approved_at&.strftime('%F')
-        %td
-          - if applicant.was_approved?
-            = icon('check', class: 'small-1')
-            Approved
-          - elsif applicant.declined?
-            = icon('check', class: 'small-1')
-            Declined
-            %br
-            = applicant.declined_reason
-          - else
-            = '-'
-        %td
+        - elsif applicant.approved?
+          = icon('check', class: 'small-1')
+          Approved
+      %td

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

@@ -0,0 +1,18 @@
+%h3 Missing Information
+%p The following information is missing: #{resource.missing_info_reason}.
+
+%p
+  Please revisit each wizard step and
+  = link_to 'complete all missing information', wizard_path(:demographics)
+  for this application.
+
+%p
+  Once you're ready, click below to re-submit your application with the updated information.
+
+%p
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
+    = f.save 'Submit Application', 'data-confirm': "Really submit application?"
+
+%p
+  %small * No additional payment required.

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

@@ -0,0 +1,36 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= applicant.wizard_step_title(:stamp)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:stamp)) if edit_effective_wizard?
+
+    - applicant.stamps.each do |stamp|
+      %table.table.table-sm
+        %tbody
+          %tr
+            %th Name
+            %td= stamp.name
+
+          %tr
+            %th Name Confirmation
+            %td= stamp.name_confirmation
+
+          %tr
+            %th Category
+            %td= stamp.category
+
+          - if stamp.shipping_address.present?
+            %tr
+              %th Shipping Address
+              %td= stamp.shipping_address.to_html
+
+          - if applicant.was_approved?
+            %tr
+              %th Submitted
+              %td= stamp.submitted_at&.strftime('%F') || '-'
+
+            %tr
+              %th Issued
+              %td= stamp.issued_at&.strftime('%F') || 'Not Issued'

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

@@ -36,5 +36,5 @@
     %tr
       %th Status
       %td
-        %span.badge.badge-secondary= applicant.status
+        %span.badge.badge-secondary= applicant.status_label
         = applicant.summary

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

@@ -0,0 +1,28 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  .card
+    .card-body
+      %p Should your application be approved, you are eligible to receive a Professional Stamp.
+
+      %p Please confirm your name as it should appear on any Professional Stamp.
+
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.fields_for(:stamps, f.object.stamp) do |fs|
+          = fs.hidden_field :applicant_id
+          = fs.hidden_field :applicant_type
+
+          = fs.hidden_field :owner_id
+          = fs.hidden_field :owner_type
+
+          = fs.hidden_field :price
+          = fs.hidden_field :tax_exempt
+          = fs.hidden_field :qb_item_name
+
+          = render 'effective/stamps/fields', f: fs
+
+        %p Stamps will be processed after approval of this application.
+
+        = f.save 'Save and Continue'

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

@@ -5,8 +5,7 @@
   - raise('expected a purchased applicant submit_order') unless resource.submit_order&.purchased?
 
   .alert.alert-success.mb-4
-    This application was submitted on
-    = resource.submit_order.purchased_at.strftime('%F')
+    This application was submitted on #{resource.submitted_at.strftime('%F')}
 
   - unless resource.approved?
     .card
@@ -20,15 +19,18 @@
   .card
     .card-body= render 'effective/applicants/summary', applicant: resource
 
+  - if resource.missing_info?
+    = card do
+      = render 'effective/applicants/missing_info', applicant: resource
+
   - if resource.min_applicant_references.to_i > 0 || resource.applicant_references.present?
-    .card
-      .card-body
-        %h3 Confidential References
-        %p
-          References are automatically sent a reference request.
-          Click 'New' to add an additional reference, or click 'Notify' to resend the reference request.
+    = card do
+      %h3 Confidential References
+      %p
+        References are automatically sent a reference request.
+        Click 'New' to add an additional reference, or click 'Notify' to resend the reference request.
 
-        = render_datatable(EffectiveApplicantReferencesDatatable.new(applicant: resource), inline: true, simple: true)
+      = render_datatable(EffectiveApplicantReferencesDatatable.new(applicant: resource), inline: true, simple: true)
 
   .mb-4
     = collapse('Show application...', card_class: 'my-2') do

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

@@ -5,4 +5,10 @@
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.submit 'Save and Continue', border: false, left: true
+
+    = f.submit(border: false, left: true) do
+      -# Missing Info
+      - if EffectiveResources.authorized?(self, :resubmit, resource)
+        = f.save 'Submit Application'
+      - else
+        = f.save 'Save and Continue'

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

@@ -0,0 +1,15 @@
+---
+subject: 'Your application was marked as completed!'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+Your application for {{ applicant.to_category }} has been marked completed.
+
+It is ready for review and a final decision to approve or decline.
+
+{{ applicant.url }}
+
+Thank you.
+
+Please contact us for assistance.

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

@@ -0,0 +1,17 @@
+---
+subject: 'Your application is missing information'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+Your application for {{ applicant.to_category }} is missing information:
+
+{{ applicant.missing_info_reason }}
+
+Please update your application with this info.
+
+{{ applicant.url }}
+
+Thank you.
+
+Please contact us for assistance.

data/config/effective_memberships.rb

@@ -21,6 +21,11 @@ EffectiveMemberships.setup do |config|
   # The defaults include: Applicant, Prorated, Renewal, Late, Admin
   # config.additional_fee_types = []
 
+  # Applicant Reviews
+  # When true, display the reviewed state and require Category.min_applicant_reviews
+  # When false, hide the reviewed state entirely
+  # config.applicant_reviews = false
+
   # Mailer Configuration
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Effective::MembershipsMailer'

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

@@ -151,6 +151,10 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.datetime :declined_at
       t.text :declined_reason
 
+      # Missing
+      t.datetime :missing_info_at
+      t.text :missing_info_reason
+
       # Applicant Educations
       t.text :applicant_educations_details
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.8'
+  VERSION = '0.3.11'
 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,
       :category_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
-      :additional_fee_types,
+      :additional_fee_types, :applicant_reviews,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :use_effective_email_templates
     ]
@@ -36,6 +36,10 @@ module EffectiveMemberships
     membership_card_class_name&.constantize || Effective::MembershipCard
   end
 
+  def self.applicant_reviews?
+    applicant_reviews == true
+  end
+
   # Singleton
   def self.Registrar
     klass = registrar_class_name&.constantize || Effective::Registrar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_products
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_resources
   requirement: !ruby/object:Gem::Requirement
@@ -303,7 +317,9 @@ files:
 - app/views/admin/applicant_references/_applicant_reference.html.haml
 - app/views/admin/applicants/_form.html.haml
 - app/views/admin/applicants/_form_approve.html.haml
+- app/views/admin/applicants/_form_complete.html.haml
 - app/views/admin/applicants/_form_decline.html.haml
+- app/views/admin/applicants/_form_missing_info.html.haml
 - app/views/admin/applicants/_form_process.html.haml
 - app/views/admin/applicants/_status.html.haml
 - app/views/admin/categories/_form.html.haml
@@ -346,9 +362,11 @@ files:
 - app/views/effective/applicants/_experience.html.haml
 - app/views/effective/applicants/_files.html.haml
 - app/views/effective/applicants/_layout.html.haml
+- app/views/effective/applicants/_missing_info.html.haml
 - app/views/effective/applicants/_orders.html.haml
 - app/views/effective/applicants/_references.html.haml
 - app/views/effective/applicants/_select.html.haml
+- app/views/effective/applicants/_stamp.html.haml
 - app/views/effective/applicants/_summary.html.haml
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
@@ -360,6 +378,7 @@ files:
 - app/views/effective/applicants/files.html.haml
 - app/views/effective/applicants/references.html.haml
 - app/views/effective/applicants/select.html.haml
+- app/views/effective/applicants/stamp.html.haml
 - app/views/effective/applicants/start.html.haml
 - app/views/effective/applicants/submitted.html.haml
 - app/views/effective/applicants/summary.html.haml
@@ -387,7 +406,9 @@ files:
 - app/views/effective/memberships/_membership.html.haml
 - app/views/effective/memberships_directory/index.html.haml
 - 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_missing_info.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid
 - app/views/layouts/effective_memberships_mailer_layout.html.haml
 - config/effective_memberships.rb