effective_memberships 0.4.14 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64b883aca41c43059e7a71714e06111778fdf28459cd1e1b93fd5623c0b1ac76
-  data.tar.gz: 988d8610c97a8975525f79b8f6b8f2ae4c8b5aa0408e363ef2122a5e75fcd8f2
+  metadata.gz: 1394fcdd25d9322f467e1392a9efeec60cc028e424ee85d3baa464d4d185a46a
+  data.tar.gz: 6c4660193bb2e98b113a4ba1e7372b469dcda714f2d78d712b635a497b488d3c
 SHA512:
-  metadata.gz: '084430f1b74612a991224992ac678b0045c01024c077159a87853a60c86c955f2d00c0a68c65bd019a7fb8a317ab6f9eb6e969425436aa72470cc42f979fc882'
-  data.tar.gz: 29ab840f13d34e4936ba3b1267e4fe9dbc7fdfdd7ca39d275ed4d87c8cc06425bd44606d45a4380a47324a877005c4671eb7c133fd9796cf631b8cfabd891aad
+  metadata.gz: 4f4bd2c3f2f544a65d9bbace898fc5538ec115175a635d2895e399597d1687850b8cbf4824bf28517c9b8cd96bee3c96fdd03fcf6224efe39db03650a85881c8
+  data.tar.gz: 9dd8b11979d28592083378f98ab4d69a3c452f156c0698e3eb717273321d4aefe20069accfe00272afc945e0791fffc202fcf3cec526b008922339a5b334f9fb

data/app/models/concerns/effective_memberships_applicant.rb

@@ -53,6 +53,7 @@ module EffectiveMembershipsApplicant
       organization: 'Organization',         # Organization only. Organization fields.
       education: 'Education',
       course_amounts: 'Courses',
+      equivalences: 'Equivalent Memberships',
       transcripts: 'Transcripts',
       experience: 'Work Experience',
       references: 'References',
@@ -127,6 +128,7 @@ module EffectiveMembershipsApplicant
 
     effective_resource do
       applicant_type         :string
+      stream                 :string
 
       # Acts as Statused
       status                 :string, permitted: false
@@ -359,6 +361,11 @@ module EffectiveMembershipsApplicant
       end
     end
 
+    def sidebar_steps
+      return self.class.required_wizard_steps unless category.present?
+      required_steps
+    end
+
     def can_visit_step?(step)
       if missing_info?
         return [:start, :select, :billing, :checkout].exclude?(step)
@@ -367,6 +374,14 @@ module EffectiveMembershipsApplicant
       can_revisit_completed_steps(step)
     end
 
+    def applicant_fee_category
+      category
+    end
+
+    def applicant_fee_price
+      category.applicant_fee
+    end
+
     # All Fees and Orders
     def submit_fees
       # Find or build submit fee
@@ -374,10 +389,10 @@ module EffectiveMembershipsApplicant
 
       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
+          category: applicant_fee_category(),
+          price: applicant_fee_price(),
+          tax_exempt: applicant_fee_category().applicant_fee_tax_exempt,
+          qb_item_name: applicant_fee_category().applicant_fee_qb_item_name
         )
       end
 

data/app/models/concerns/effective_memberships_category.rb

@@ -101,6 +101,7 @@ module EffectiveMembershipsCategory
 
     serialize :can_apply_restricted_ids, Array
     serialize :applicant_wizard_steps, Array
+    serialize :applicant_review_wizard_steps, Array
     serialize :fee_payment_wizard_steps, Array
 
     scope :deep, -> { includes(:rich_texts) }

data/app/models/effective/applicant_experience.rb

@@ -34,7 +34,7 @@ module Effective
     validates :position, presence: true
     validates :employer, presence: true
     validates :start_on, presence: true
-    validates :end_on, presence: true
+    validates :end_on, presence: true, unless: -> { still_work_here? }
     validates :level, presence: true, inclusion: { in: LEVELS }
     validates :months, presence: true
 

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

@@ -1,54 +1 @@
-= tabs do
-  - # Done applicants have the Applicant tab first. In progress ones the Status tab
-  - if applicant.done?
-    = tab 'Applicant' do
-      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
-      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
-
-    = tab 'Status' do
-      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
-
-  - if applicant.in_progress?
-    = tab 'Status' do
-      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
-
-    = tab 'Applicant' do
-      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
-      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
-
-  - # Just normal tabs now
-  - if applicant.was_submitted? && !applicant.was_approved?
-    = 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.applicant_endorsements.present?
-    = tab 'Endorsements' do
-      .mb-4= render_inline_datatable(Admin::EffectiveApplicantEndorsementsDatatable.new(applicant: applicant))
-
-  - if applicant.transcripts_required?
-    = tab 'Transcripts' do
-      = render 'admin/applicants/form_transcripts', applicant: applicant
-
-  - if applicant.fees.present? || applicant.orders.present?
-    = tab 'Fees' do
-      .mb-4
-        %h2 Fees
-        - datatable = Admin::EffectiveFeesDatatable.new(applicant: applicant, total: false)
-        = render_datatable(datatable, simple: true, inline: true)
-
-      .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: applicant.owner, except_id: applicant.id))
-
-  - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
-    = tab 'Logs' do
-      = render_inline_datatable(applicant.log_changes_datatable)
+= render('admin/applicants/form_applicant', applicant: applicant)

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

@@ -0,0 +1,56 @@
+= tabs do
+  - # Done applicants have the Applicant tab first. In progress ones the Status tab
+  - if applicant.done?
+    = tab 'Applicant' do
+      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
+      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
+
+    = tab 'Status' do
+      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
+
+  - if applicant.in_progress?
+    = tab 'Status' do
+      = render 'admin/applicants/status', applicant: applicant, namespace: :admin
+
+    = tab 'Applicant' do
+      .mb-4= render 'effective/applicants/summary', applicant: applicant, namespace: :admin
+      = render 'effective/applicants/applicant', applicant: applicant, namespace: :admin
+
+  - # Just normal tabs now
+  - if applicant.was_submitted? && !applicant.was_approved?
+    = 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.applicant_endorsements.present?
+    = tab 'Endorsements' do
+      .mb-4= render_inline_datatable(Admin::EffectiveApplicantEndorsementsDatatable.new(applicant: applicant))
+
+  - if applicant.transcripts_required?
+    = tab 'Transcripts' do
+      = render 'admin/applicants/form_transcripts', applicant: applicant
+
+  = yield
+
+  - if applicant.fees.present? || applicant.orders.present?
+    = tab 'Fees' do
+      .mb-4
+        %h2 Fees
+        - datatable = Admin::EffectiveFeesDatatable.new(applicant: applicant, total: false)
+        = render_datatable(datatable, simple: true, inline: true)
+
+      .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: applicant.owner, except_id: applicant.id))
+
+  - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
+    = tab 'Logs' do
+      = render_inline_datatable(applicant.log_changes_datatable)

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

@@ -19,7 +19,7 @@
         = aef.hidden_field :endorser_type
 
         = aef.select :endorser_id, endorders_collection, required: false,
-          ajax_url: effective_memberships.select2_ajax_endorser_applicant_endorsement_path(applicant_id: resource)
+          ajax_url: (effective_memberships.select2_ajax_endorser_applicant_endorsement_path(applicant_id: resource) unless Rails.env.test?)
 
         = aef.check_box :unknown_member, label: 'I cant find my endorser in the above list'
 

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

@@ -3,6 +3,9 @@
 
   = card do
     - if resource.min_applicant_educations > 0
+      %p You must include #{resource.min_applicant_educations} or more work experiences.
+
+    - if resource.min_applicant_experiences_months > 0
       %p You must include #{resource.min_applicant_experiences_months} or more months of experience.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

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

@@ -16,6 +16,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
+        = f.hidden_field :stream, value: nil
         = f.hidden_field :organization_id, value: nil
         = f.hidden_field :organization_type, value: nil
         = f.hidden_field :category_type, value: EffectiveMemberships.Category.name

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

@@ -167,6 +167,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     # Applicants
     create_table :applicants do |t|
       t.string :applicant_type
+      t.string :stream
       t.string :token
 
       t.integer :user_id

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.14'
+  VERSION = '0.4.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.17
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -337,6 +337,7 @@ files:
 - 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_applicant.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