effective_memberships 0.4.15 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28543acc716acda559f603f4f8b1da0b608897ff9e251c04936f4cc32e186f2e
-  data.tar.gz: d524120cc69e13abc09af94999aef3bc7a00c5866b7ec97d450c6bf88bbe68d2
+  metadata.gz: 51b551fdd6f2f1148fcca4d2d34a8745c14e359210634508ae26939d4a4563ec
+  data.tar.gz: 85fff32681fd9c9e64e1010df663fb2ec7aeb5f95e2b9a95aeb7e944aad370c2
 SHA512:
-  metadata.gz: a4a4f48f38e7e504be81e7914c3612405ac82121c47774dafcadf1e46b734a58b63ae9a689de62af385bed7a249cab8bd8714a3008eacd96b86483a4ea56ee1b
-  data.tar.gz: 1f69dbcd48f106c91b7226a3dc99bc105783b6bbdaf22db60e30f89b6ad5200b06190477599bb7fbf8ef07e804aac5d8decc619c467ce3e3597514ab2a90e62d
+  metadata.gz: 9e8c76e43c5e006162ffdc8c13274f3a6f70046a52bafac971487161f6720ba3ea056235c271d1e41778d2ec93cbc9feb4ca07e89486fd5f97a36e57f6308abc
+  data.tar.gz: 6cbadbdab149dd6f473fede0536c5f79710cd354cf229fc24f30ae3dbc0ae3706167eb45374e6839fd4e578da45944389c885fb279238dbd9d326872a9677d55

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',
@@ -373,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
@@ -380,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/concerns/effective_memberships_owner.rb

@@ -53,6 +53,15 @@ module EffectiveMembershipsOwner
       where(id: with_paid_fees_through.select(:owner_id))
     }
 
+    scope :members_with_category, -> (categories) {
+      raise('expected an EffectiveMemberships.Category') unless Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
+
+      membership_categories = Effective::MembershipCategory.where(category: categories)
+      memberships = Effective::Membership.where(id: membership_categories.select(:membership_id))
+
+      where(id: memberships.where(owner_type: name).select(:owner_id))
+    }
+
   end
 
   def assign_member_role

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/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.15'
+  VERSION = '0.4.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.18
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-29 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