effective_memberships 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981aea653a25a94a440ce8599ab99cab71f429ac409a839f5f061d9731239d2e
-  data.tar.gz: b88503a72edd658d63e81b49d4b17c4402dde65d717692db4dff53f3b54c02fe
+  metadata.gz: 299989dcd361fdf24b0ba06461caaf5708934a416c356c9a24ab088bad96e4bb
+  data.tar.gz: b2ea47e531173ce84ca9732f75f1d9d4dd3f82f0f382fc6723d4efdc3124f455
 SHA512:
-  metadata.gz: 67066fc2672c948a59c20cd1422e88d39a5b41be07aecf36ede4dcace2919e91c0d1058c165ebad70af7ed6dedcdc47015f447d89449c330d7cd1edf537a80cb
-  data.tar.gz: 7f46ea79c2d79e431f1150224180520850dbc683b399b9758801818d9ab213de67e6e4902a1e3861a1b16a5f54843fe048f5e0c5222d89cda27351ae5f6e28a6
+  metadata.gz: 520f5f62ef9b6faa7d281a93055cf078fc3138ce29c0a176852c6ee3504ea3412936166463e3fd0603b19fe627e1ea5c1074457ecedf238b5d2f6b98e1983f53
+  data.tar.gz: 96ccdbb68a88d7faeb8c97addc37b4f85d7c96a2c36d9967309e4edb50e8c27a793387a96c29ea0a18a8999287338a65cdae6d76b9606f700eca2803f12edb28

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/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]
@@ -81,20 +77,20 @@ module EffectiveMembershipsApplicant
     belongs_to :category, polymorphic: true, optional: true
     belongs_to :from_category, polymorphic: true, optional: true
 
-    has_many :applicant_reviews, -> { order(:id) }, inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_reviews, -> { order(:id) }, as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_reviews, reject_if: :all_blank, allow_destroy: true
 
     # Effective Namespace
-    has_many :applicant_courses, -> { order(:id) }, class_name: 'Effective::ApplicantCourse', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_courses, -> { order(:id) }, class_name: 'Effective::ApplicantCourse', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_courses, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_educations, -> { order(:id) }, class_name: 'Effective::ApplicantEducation', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_educations, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_experiences, -> { order(:id) }, class_name: 'Effective::ApplicantExperience', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_experiences, reject_if: :all_blank, allow_destroy: true
 
-    has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', inverse_of: :applicant, dependent: :destroy
+    has_many :applicant_references, -> { order(:id) }, class_name: 'Effective::ApplicantReference', as: :applicant, dependent: :destroy
     accepts_nested_attributes_for :applicant_references, reject_if: :all_blank, allow_destroy: true
 
     has_many :fees, -> { order(:id) }, as: :parent, class_name: 'Effective::Fee', dependent: :nullify
@@ -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/models/effective/applicant_course.rb

@@ -4,8 +4,8 @@ module Effective
 
     belongs_to :applicant_course_area
 
+    belongs_to :applicant, polymorphic: true, optional: true
     belongs_to :applicant_course_name, optional: true
-    belongs_to :applicant, optional: true
 
     effective_resource do
       title          :string

data/app/models/effective/applicant_education.rb

@@ -1,6 +1,6 @@
 module Effective
   class ApplicantEducation < ActiveRecord::Base
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 

data/app/models/effective/applicant_experience.rb

@@ -1,6 +1,6 @@
 module Effective
   class ApplicantExperience < ActiveRecord::Base
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
 

data/app/models/effective/applicant_reference.rb

@@ -5,7 +5,7 @@ module Effective
     acts_as_statused :submitted, :completed
     log_changes(to: :applicant) if respond_to?(:log_changes)
 
-    belongs_to :applicant
+    belongs_to :applicant, polymorphic: true
 
     KNOWNS = ['6 months - 1 year', '1 year - 2 years', '2 - 5 years', '5 - 10 years', 'More than 10 years']
     RELATIONSHIPS = ['Supervisor', 'Employer', 'Colleague', 'Other']

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/db/migrate/01_create_effective_memberships.rb.erb

@@ -172,6 +172,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Educations
     create_table :applicant_educations do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.date :start_on
       t.date :end_on
@@ -191,6 +192,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Experiences
     create_table :applicant_experiences do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string :level
       t.integer :months
@@ -216,6 +218,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant References
     create_table :applicant_references do |t|
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string :name
       t.string :email
@@ -264,7 +267,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     create_table :applicant_courses do |t|
       t.integer :applicant_course_area_id
       t.integer :applicant_course_name_id
+
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.string  :title
       t.integer :amount
@@ -279,7 +284,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicant Reviews
     create_table :applicant_reviews do |t|
       t.string :token
+
       t.integer :applicant_id
+      t.string :applicant_type
 
       t.integer :reviewer_id
       t.string :reviewer_type

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -343,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
@@ -366,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