effective_memberships 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240ed521dcef407cae7be663d49f877b373012b2fbd8877b787a4fa315539a2b
-  data.tar.gz: 394ebf710135b07e984df6277e80ca2340f8f4e4e61980e127dd0113ea6e2dca
+  metadata.gz: 6edc66bd8a9a8c6b9d38fb90cb42c8041efde67d7e2d5b80b14169678e70e9ff
+  data.tar.gz: 928861f7ee7ee4a2e2f1f77f3e8209909948ba7470ad2894267cbe29084e1290
 SHA512:
-  metadata.gz: 7602bafa9bd4d86c4d01db0acadf432da1b9af29c7eeee171d3e560baa74037318802e7604282986bbe09230fbee3ae8005ee1f3148ff477422d0ef5ed83d138
-  data.tar.gz: a3d51cf1a5d0941b48d1a3c400115973478acf21c501daf8e79aa61b83bb2109c314c6091d8a8742d1637b21895cd214819c94b53aef5e0743db3371f384bef8
+  metadata.gz: 9a928f4b12eead76fc74ebd7fe39838829484796b4dd017dbbc35236f9bdd16d0bdcf7cc74526fbb95dee1711c82157c817f084352aa6bcde3ce35c2306e5a59
+  data.tar.gz: b2dca432e504b87d57b88c2e36624cf857f3364c346828d355b58e28188b01a4ff38bdaece31b60cadc976075d9e62f4d7bf0530d260d63ecdd31b051702f014

data/app/controllers/admin/applicant_references_controller.rb

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

data/app/controllers/effective/applicant_references_controller.rb

@@ -24,12 +24,11 @@ module Effective
 
     def permitted_params
       permitted = params.require(:effective_applicant_reference).permit!.except(:token, :last_notified_at, :status, :status_steps)
-      authorized = current_user.effective_memberships_owners.include?(resource.applicant.owner) == false
 
-      if resource.submitted? && resource.applicant.was_submitted? && authorized
-        permitted
-      else
+      if current_user && current_user.effective_memberships_owners.include?(resource.applicant&.owner)
         permitted.except(:reservations, :reservations_reason, :work_history, :accept_declaration)
+      else
+        permitted
       end
 
     end

data/app/controllers/effective/applicants_controller.rb

@@ -6,29 +6,5 @@ module Effective
 
     resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners) }
 
-    # Allow only 1 in-progress application at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      existing = resource_scope.in_progress.where.not(id: resource).first
-
-      if existing.present?
-        flash[:success] = "You have been redirected to your existing in progress application"
-        redirect_to effective_memberships.applicant_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      params.require(:applicant).permit!.except(
-        :owner_id, :owner_type, :status, :status_steps, :wizard_steps,
-        :submitted_at, :completed_at, :reviewed_at, :approved_at,
-        :declined_at, :declined_reason, :created_at, :updated_at
-      )
-    end
-
   end
 end

data/app/controllers/effective/fee_payments_controller.rb

@@ -6,27 +6,5 @@ module Effective
 
     resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owners) }
 
-    # Allow only 1 in-progress fee payment at a time
-    before_action(only: [:new, :show], unless: -> { resource&.done? }) do
-      existing = resource_scope.in_progress.where.not(id: resource).first
-
-      if existing.present?
-        flash[:success] = "You have been redirected to your existing in progress fee payment"
-        redirect_to effective_memberships.fee_payment_build_path(existing, existing.next_step)
-      end
-    end
-
-    after_save do
-      flash.now[:success] = ''
-    end
-
-    private
-
-    def permitted_params
-      params.require(:fee_payment).permit!.except(
-        :status, :status_steps, :wizard_steps, :submitted_at
-      )
-    end
-
   end
 end

data/app/datatables/admin/effective_applicant_references_datatable.rb

@@ -0,0 +1,31 @@
+class Admin::EffectiveApplicantReferencesDatatable < Effective::Datatable
+
+  datatable do
+    order :name
+
+    col :applicant
+
+    col :name
+    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 |reference|
+      reference.last_notified_at&.strftime('%F') unless reference.completed?
+    end
+
+    actions_col
+  end
+
+  collection do
+    Effective::ApplicantReference.deep.all
+  end
+
+end

data/app/helpers/effective_memberships_helper.rb

@@ -1,15 +1,2 @@
 module EffectiveMembershipsHelper
-
-  def edit_effective_applicants_wizard?
-    params[:controller] == 'effective/applicants' && defined?(resource) && resource.draft?
-  end
-
-  def edit_effective_applicant_reviews_wizard?
-    params[:controller] == 'effective/applicant_reviews' && defined?(resource) && resource.draft?
-  end
-
-  def edit_effective_fee_payments_wizard?
-    params[:controller] == 'effective/fee_payments' && defined?(resource) && resource.draft?
-  end
-
 end

data/app/models/concerns/effective_memberships_applicant.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsApplicant
   module ClassMethods
     def effective_memberships_applicant?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     # For effective_category_applicant_wizard_steps_collection
     def required_wizard_steps
       [:start, :select, :summary, :billing, :checkout, :submitted]
@@ -316,13 +312,15 @@ module EffectiveMembershipsApplicant
       raise('already submitted') if was_submitted?
       raise('expected a purchased order') unless submit_order&.purchased?
 
+      wizard_steps[:checkout] ||= Time.zone.now
+      wizard_steps[:submitted] = Time.zone.now
+      submitted!
+
       after_commit do
         applicant_references.each { |reference| reference.notify! if reference.submitted? }
       end
 
-      wizard_steps[:checkout] ||= Time.zone.now
-      wizard_steps[:submitted] = Time.zone.now
-      submitted!
+      true
     end
 
   end
@@ -530,9 +528,10 @@ module EffectiveMembershipsApplicant
       raise('unsupported approval applicant_type')
     end
 
-    after_commit { send_email(:applicant_approved) }
-
     save!
+
+    after_commit { send_email(:applicant_approved) }
+    true
   end
 
   # Admin approves an applicant. Registers the owner. Sends an email.
@@ -546,9 +545,10 @@ module EffectiveMembershipsApplicant
     wizard_steps[:submitted] ||= Time.zone.now
     declined!
 
-    after_commit { send_email(:applicant_declined) }
-
     save!
+
+    after_commit { send_email(:applicant_declined) }
+    true
   end
 
   private

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsApplicantReview
   module ClassMethods
     def effective_memberships_applicant_review?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     # For effective_category_applicant_wizard_steps_collection
     def required_wizard_steps
       [:start, :recommendation, :submitted]
@@ -113,30 +109,33 @@ module EffectiveMembershipsApplicantReview
     end
 
     def conflict_of_interest!
-      after_commit { send_email(:applicant_review_conflict_of_interest) }
-
       update!(conflict_of_interest: true, recommendation: nil)
       conflicted!
 
       applicant.save!
+
+      after_commit { send_email(:applicant_review_conflict_of_interest) }
+      true
     end
 
     def accept!
-      after_commit { send_email(:applicant_review_completed) }
-
       assign_attributes(recommendation: 'Accept')
       accepted!
 
       applicant.save!
-    end
 
-    def reject!
       after_commit { send_email(:applicant_review_completed) }
+      true
+    end
 
+    def reject!
       assign_attributes(recommendation: 'Reject')
       rejected!
 
       applicant.save!
+
+      after_commit { send_email(:applicant_review_completed) }
+      true
     end
 
     private

data/app/models/concerns/effective_memberships_category.rb

@@ -176,7 +176,7 @@ module EffectiveMembershipsCategory
   end
 
   def applicant_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.Applicant.const_get(:WIZARD_STEPS)
+    wizard_steps = EffectiveMemberships.Applicant.all_wizard_steps
     required_steps = EffectiveMemberships.Applicant.required_wizard_steps
 
     wizard_steps.map do |step, title|
@@ -185,7 +185,7 @@ module EffectiveMembershipsCategory
   end
 
   def fee_payment_wizard_steps_collection
-    wizard_steps = EffectiveMemberships.FeePayment.const_get(:WIZARD_STEPS)
+    wizard_steps = EffectiveMemberships.FeePayment.all_wizard_steps
     required_steps = EffectiveMemberships.FeePayment.required_wizard_steps
 
     wizard_steps.map do |step, title|

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -16,10 +16,6 @@ module EffectiveMembershipsFeePayment
   module ClassMethods
     def effective_memberships_fee_payment?; true; end
 
-    def all_wizard_steps
-      const_get(:WIZARD_STEPS).keys
-    end
-
     def required_wizard_steps
       [:start, :summary, :billing, :checkout, :submitted]
     end

data/app/views/admin/applicant_references/_applicant_reference.html.haml

@@ -0,0 +1 @@
+= render '/effective/applicant_references/applicant_reference', applicant_reference: applicant_reference, skip_actions: true

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

@@ -21,6 +21,10 @@
     = tab 'Process' do
       = render 'admin/applicants/form_process', applicant: applicant
 
+  - if applicant.applicant_references.present?
+    = tab 'References' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantReferencesDatatable.new(applicant: applicant))
+
   - if applicant.fees.present?
     = tab 'Fees' do
       .mb-4= render_inline_datatable(Admin::EffectiveFeesDatatable.new(applicant_id: applicant.to_param))

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

@@ -51,9 +51,9 @@
             = applicant.min_applicant_references
             Required References Responded
         - else
-          - if applicant.applicant_references.count(&:submitted?) > 0
+          - if applicant.applicant_references.present?
             %p
-              = applicant.applicant_references.count(&:submitted?)
+              = applicant.applicant_references.count(&:completed?)
               = '/'
               = applicant.applicant_references.count
               References Responded

data/app/views/effective/applicant_references/_applicant_reference.html.haml

@@ -23,7 +23,7 @@
           - elsif reference.completed?
             Response completed
 
-    - if reference.applicant.was_submitted? && !reference.completed?
+    - unless reference.applicant.was_approved?
       %tr
         %th Last Notified at
         %td= reference.last_notified_at&.strftime('%F') || 'Never'

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

@@ -1,6 +1,3 @@
 .effective-applicant
-  - blacklist = EffectiveMemberships.Applicant.required_wizard_steps
-  - steps = applicant.required_steps - blacklist
-
-  - steps.select { |step| applicant.has_completed_step?(step) }.each do |partial|
+  - applicant.render_steps.each do |partial|
     = render "effective/applicants/#{partial}", applicant: applicant, step: partial

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:course_amounts)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:course_amounts)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:course_amounts)) if edit_effective_wizard?
 
 
     - applicant.applicant_course_areas_collection.each do |area|

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:declarations)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,6 +4,6 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:demographics)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
     = render 'effective/applicants/demographics_owner', applicant: applicant, owner: applicant.owner

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:education)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:education)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:education)) if edit_effective_wizard?
 
     - datatable = EffectiveApplicantEducationsDatatable.new(applicant_id: applicant.id)
     .mb-4= render_simple_datatable(datatable)

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:experience)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:experience)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:experience)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:files)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:files)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:files)) if edit_effective_wizard?
 
     %table.table
       %tbody

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

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= applicant.wizard_step_title(:references)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:references)) if edit_effective_applicants_wizard?
+        = link_to('Edit', wizard_path(:references)) if edit_effective_wizard?
 
     - applicant.applicant_references.each_with_index do |applicant_reference, index|
       - if index > 0

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

@@ -0,0 +1 @@
+-# Intentionally blank

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

@@ -34,11 +34,8 @@
     = collapse('Show application...', card_class: 'my-2') do
       = render 'effective/applicants/applicant', applicant: resource
 
-  = render 'effective/applicants/orders', applicant: resource
-
-  -# - if resource.can_visit_step?(next_step)
-  -#   = effective_form_with(model: resource, url: wizard_path(step)) do |f|
-  -#     = f.hidden_field :current_step
-  -#     = f.submit 'Save and Continue', class: 'btn btn-primary'
+  .mb-4
+    = collapse('Show orders...', card_class: 'my-2') do
+      = render 'effective/applicants/orders', applicant: resource
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary btn-block'

data/app/views/effective/fee_payments/_declarations.html.haml

@@ -4,7 +4,7 @@
       .col-sm
         %h5.card-title= fee_payment.wizard_step_title(:declarations)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:declarations)) if edit_effective_fee_payments_wizard?
+        = link_to('Edit', wizard_path(:declarations)) if edit_effective_wizard?
 
     %table.table
       %tbody

data/app/views/effective/fee_payments/_demographics.html.haml

@@ -4,6 +4,6 @@
       .col-sm
         %h5.card-title= fee_payment.wizard_step_title(:demographics)
       .col-sm-auto.text-right
-        = link_to('Edit', wizard_path(:demographics)) if edit_effective_fee_payments_wizard?
+        = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
     = render 'effective/fee_payments/demographics_owner', fee_payment: fee_payment, owner: fee_payment.owner

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

@@ -1,6 +1,3 @@
 .effective-fee-payment
-  - blacklist = EffectiveMemberships.FeePayment.required_wizard_steps
-  - steps = fee_payment.required_steps - blacklist
-
-  - steps.select { |step| fee_payment.has_completed_step?(step) }.each do |partial|
+  - fee_payment.render_steps.each do |partial|
     = render "effective/fee_payments/#{partial}", fee_payment: fee_payment, resource: fee_payment, step: partial

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

@@ -0,0 +1 @@
+-# Intentionally blank

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

@@ -9,6 +9,7 @@
 
   = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
 
+  = render 'effective/fee_payments/summary', fee_payment: resource
   = render 'effective/fee_payments/fee_payment', fee_payment: resource
   = render 'effective/fee_payments/orders', fee_payment: resource
 

data/config/routes.rb

@@ -22,6 +22,11 @@ EffectiveMemberships::Engine.routes.draw do
 
   namespace :admin do
     resources :applicants, except: [:new, :create, :show]
+
+    resources :applicant_references, only: [:show] do
+      post :notify, on: :member
+    end
+
     resources :fees
     resources :categories, except: [:show]
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.2'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,6 +240,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_references_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
@@ -252,6 +253,7 @@ files:
 - app/controllers/effective/memberships_directory_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_references_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
 - app/datatables/admin/effective_fee_payments_datatable.rb
@@ -293,6 +295,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_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_decline.html.haml
@@ -340,6 +343,7 @@ files:
 - app/views/effective/applicants/_layout.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/_summary.html.haml
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
@@ -363,6 +367,7 @@ files:
 - app/views/effective/fee_payments/_fee_payment.html.haml
 - app/views/effective/fee_payments/_layout.html.haml
 - app/views/effective/fee_payments/_orders.html.haml
+- app/views/effective/fee_payments/_summary.html.haml
 - app/views/effective/fee_payments/billing.html.haml
 - app/views/effective/fee_payments/checkout.html.haml
 - app/views/effective/fee_payments/declarations.html.haml