effective_memberships 0.13.4 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 718e2873066f712dd1cdaa3522d618f9684cf1c5d8ca328be1df0e016b0ac60d
-  data.tar.gz: 7a3828dddc3227e7f082ebc3e01d68b1044a1a8bc3b9272f7c1c896c59dc2c71
+  metadata.gz: 77571110c375655e79ac7ef7150003db9d611ea564d7f0f9ebc65ec38be21715
+  data.tar.gz: a6aa04f69f1cf002779f768f6b2362b819bbfdb8d874ee23bfad8f4ed1c1f65f
 SHA512:
-  metadata.gz: f83fb65b0170f946b86947a318d665acb292ebf1d0c81e837579cf07a98c9338fb81f7283275e3488915f469b15d541cc809b5f09b0dc3aa59d4d77bbcb023cd
-  data.tar.gz: 000f1b03e6c89bc8e5a47fab09753d91b124b7f973c2442408498ef8247da380d491b43e04d868412bff08360edaa00c1560ca5f71e90629aa252bdf113a2354
+  metadata.gz: 96bad4189f675621a5fc51652b23c021fd09e21bb4737a3b97e7ab0f3fa2a770bdc437dac40fc27179b3c91b19d7ce296cb50d14601fc83d8e7be8184df6a382
+  data.tar.gz: b979ee021ff929ebbab1415f5da5e89134fb2202c4f41bafeeb514c83e10312bf9cc97bf8aa0ad3ea73ef185463eaef574c8d5a94564c589ad16586e18aa4f29

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -32,6 +32,7 @@ module Admin
 
       col :applicant_type
       col :category, label: 'Applicant Category', search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :stream
       col :from_category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
       col :from_status, search: { collection: EffectiveMemberships.Status.all, polymorphic: false }
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -63,6 +63,7 @@ module EffectiveMembershipsApplicant
       experience: 'Work Experience',
       references: 'References',
       files: 'Attach Files',
+      cpd: 'Continuing Professional Development',
       stamp: 'Professional Stamp',
       declarations: 'Declarations',
       summary: 'Review',
@@ -78,6 +79,8 @@ module EffectiveMembershipsApplicant
     has_many_attached :applicant_files
     has_many_attached :transcripts
 
+    has_many_purgable if respond_to?(:has_many_purgable)
+
     # Transcripts Step
     attr_accessor :declare_will_send_transcripts
 
@@ -88,6 +91,9 @@ module EffectiveMembershipsApplicant
     # Reinstatements Step
     attr_accessor :declare_reinstatement
 
+    # CPD Step
+    attr_accessor :declare_cpd
+
     # Admin Approve Step
     attr_accessor :approved_membership_number
     attr_accessor :approved_membership_date
@@ -344,6 +350,17 @@ module EffectiveMembershipsApplicant
       end
     end
 
+    # CPD step
+    with_options(if: -> { current_step == :cpd }) do
+      validates :declare_cpd, acceptance: true
+
+      validate do
+        if (cpd_cycles = cpd_uncompleted_cpd_cycles).present?
+          self.errors.add(:base, "Please complete #{cpd_cycles.map(&:to_s).to_sentence} to continue")
+        end
+      end
+    end
+
     # Transcripts step
     with_options(if: -> { current_step == :transcripts }) do
       validates :declare_will_send_transcripts, acceptance: true
@@ -710,6 +727,28 @@ module EffectiveMembershipsApplicant
     required_steps.include?(:transcripts)
   end
 
+  # CPD Step
+  def cpd_requirement
+    (category&.applicant_cpd_step_requirement.presence || EffectiveMemberships.Category.cpd_step_requirements.first)
+  end
+
+  def cpd_required_cpd_cycles
+    date = submitted_at || Time.zone.now
+
+    [
+      (EffectiveCpd.previous_cpd_cycle(date: date) if cpd_requirement.to_s.include?('previous')),
+      (EffectiveCpd.current_cpd_cycle(date: date) if cpd_requirement.to_s.include?('current'))
+    ].compact
+  end
+
+  def cpd_completed_cpd_cycles
+    cpd_required_cpd_cycles.select { |cpd_cycle| user&.cpd_statement(cpd_cycle: cpd_cycle)&.completed? }
+  end
+
+  def cpd_uncompleted_cpd_cycles
+    cpd_required_cpd_cycles.reject { |cpd_cycle| user&.cpd_statement(cpd_cycle: cpd_cycle)&.completed? }
+  end
+
   # Files Step
   def min_applicant_files
     category&.min_applicant_files.to_i

data/app/models/concerns/effective_memberships_category.rb

@@ -23,6 +23,19 @@ module EffectiveMembershipsCategory
     def categories
       []
     end
+
+    # These are the values for the Applicant and FeePayment cpd_step_requirements fields
+    # The first entry should always mean None Required.
+    # Please use current and previous as lowercase
+    def cpd_step_requirements
+      [
+        'None',
+        'Must submit current',
+        'Must submit previous',
+        'Must submit current and previous'
+      ]
+    end
+
   end
 
   included do
@@ -55,6 +68,7 @@ module EffectiveMembershipsCategory
       applicant_reinstatement_fee   :integer
       applicant_wizard_steps        :text
 
+      applicant_cpd_step_requirement    :string
       min_applicant_educations          :integer
       min_applicant_endorsements        :integer
       min_applicant_equivalences        :integer
@@ -82,7 +96,8 @@ module EffectiveMembershipsCategory
       prorated_dec        :integer
 
       # Fee Payments
-      fee_payment_wizard_steps   :text
+      fee_payment_wizard_steps          :text
+      fee_payment_cpd_step_requirement  :string
 
       # Renewals
       create_renewal_fees   :boolean

data/app/models/concerns/effective_memberships_fee_payment.rb

@@ -45,6 +45,9 @@ module EffectiveMembershipsFeePayment
 
     log_changes(except: :wizard_steps) if respond_to?(:log_changes)
 
+    # CPD Step
+    attr_accessor :declare_cpd
+
     # Declarations Step
     attr_accessor :declare_code_of_ethics
     attr_accessor :declare_truth
@@ -120,6 +123,17 @@ module EffectiveMembershipsFeePayment
       self.errors.add(:base, 'please complete your existing fee payment first') if existing.present?
     end
 
+    # CPD step
+    with_options(if: -> { current_step == :cpd }) do
+      validates :declare_cpd, acceptance: true
+
+      validate do
+        if (cpd_cycles = cpd_uncompleted_cpd_cycles).present?
+          self.errors.add(:base, "Please complete #{cpd_cycles.map(&:to_s).to_sentence} to continue")
+        end
+      end
+    end
+
     # Declarations Step
     with_options(if: -> { current_step == :declarations }) do
       validates :declare_code_of_ethics, acceptance: true
@@ -169,7 +183,8 @@ module EffectiveMembershipsFeePayment
 
     # We take over the owner's outstanding fee payment fees.
     def find_or_build_submit_fees
-      Array(owner.outstanding_fee_payment_fees).each { |fee| fees << fee unless fees.include?(fee) }
+      existing = fees.to_a
+      Array(owner.outstanding_fee_payment_fees).each { |fee| self.fees << fee unless existing.include?(fee) }
       submit_fees
     end
 
@@ -224,4 +239,26 @@ module EffectiveMembershipsFeePayment
     save!
   end
 
+  # CPD Step
+  def cpd_requirement
+    (category&.fee_payment_cpd_step_requirement.presence || EffectiveMemberships.Category.cpd_step_requirements.first)
+  end
+
+  def cpd_required_cpd_cycles
+    date = submitted_at || Time.zone.now
+
+    [
+      (EffectiveCpd.previous_cpd_cycle(date: date) if cpd_requirement.to_s.include?('previous')),
+      (EffectiveCpd.current_cpd_cycle(date: date) if cpd_requirement.to_s.include?('current'))
+    ].compact
+  end
+
+  def cpd_completed_cpd_cycles
+    cpd_required_cpd_cycles.select { |cpd_cycle| user&.cpd_statement(cpd_cycle: cpd_cycle)&.completed? }
+  end
+
+  def cpd_uncompleted_cpd_cycles
+    cpd_required_cpd_cycles.reject { |cpd_cycle| user&.cpd_statement(cpd_cycle: cpd_cycle)&.completed? }
+  end
+
 end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -63,6 +63,47 @@ module EffectiveMembershipsRegistrar
     period(date: date).end_of_year
   end
 
+  def current_period
+    period(date: Time.zone.now)
+  end
+
+  def last_period
+    advance_period(period: current_period, number: -1)
+  end
+
+  # Returns a date of Jan 1, Year
+  def period(date:)
+    cutoff = renewal_fee_date(date: date) # period_end_on
+    period = (date < cutoff) ? advance_period(period: date, number: 0) : advance_period(period: date, number: 1)
+    period.to_date
+  end
+
+  # This is only used for a form collection on admin memberships
+  def periods(from:, to: nil)
+    to ||= Time.zone.now
+
+    raise('expected to date') unless to.respond_to?(:strftime)
+    raise('expected from date') unless from.respond_to?(:strftime)
+
+    from = period(date: from)
+    to = period(date: to)
+
+    retval = []
+
+    loop do
+      retval << from
+      from = advance_period(period: from, number: 1)
+      break if from > to
+    end
+
+    retval
+  end
+
+  def periods_collection(from: nil, to: nil)
+    from ||= Time.zone.now - 10.years
+    periods(from: from, to: to).reverse.map { |period| [period_end_on(date: period), period] }
+  end
+
   # Category is required, statuses are optional
   def assign!(owner, categories:, statuses: nil, date: nil, number: nil)
     categories = Array(categories)
@@ -423,46 +464,6 @@ module EffectiveMembershipsRegistrar
     number.to_s
   end
 
-  def current_period
-    period(date: Time.zone.now)
-  end
-
-  def last_period
-    advance_period(period: current_period, number: -1)
-  end
-
-  # Returns a date of Jan 1, Year
-  def period(date:)
-    cutoff = renewal_fee_date(date: date) # period_end_on
-    period = (date < cutoff) ? advance_period(period: date, number: 0) : advance_period(period: date, number: 1)
-    period.to_date
-  end
-
-  # This is only used for a form collection on admin memberships
-  def periods(from:, to: nil)
-    to ||= Time.zone.now
-
-    raise('expected to date') unless to.respond_to?(:strftime)
-    raise('expected from date') unless from.respond_to?(:strftime)
-
-    from = period(date: from)
-    to = period(date: to)
-
-    retval = []
-
-    loop do
-      retval << from
-      from = advance_period(period: from, number: 1)
-      break if from > to
-    end
-
-    retval
-  end
-
-  def periods_collection(from: nil, to: nil)
-    from ||= Time.zone.now - 10.years
-    periods(from: from, to: to).reverse.map { |period| [period_end_on(date: period), period] }
-  end
 
   # Called by applicant.approve!
   def delete_fees!(resource)

data/app/models/effective/fee.rb

@@ -53,9 +53,15 @@ module Effective
 
     before_validation do
       self.period ||= EffectiveMemberships.Registrar.current_period
+      self.checkout_type ||= CHECKOUT_TYPES.first
+
       self.title = default_title() if self.title.blank?
     end
 
+    before_validation(if: -> { qb_item_name.blank? && category.present? }) do
+      assign_attributes(qb_item_name: category.qb_item_name, tax_exempt: category.tax_exempt?)
+    end
+
     before_validation(if: -> { fee_type == 'Renewal' && category.present? && period.present? }) do
       self.late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
       self.not_in_good_standing_on ||= EffectiveMemberships.Registrar.not_in_good_standing_date(period: period) if category.create_not_in_good_standing?

data/app/views/admin/categories/_fields_applicant_requirements.html.haml

@@ -0,0 +1,55 @@
+%p The following numbers set the minimum number of required items an applicant must provide to complete each step. Leave blank for none.
+
+- applicant = EffectiveMemberships.Applicant.new
+
+%table.table.table-sm
+  %tbody
+    - if applicant.wizard_step_keys.include?(:education)
+      %tr
+        %td= applicant.wizard_step_title(:education)
+        %td= f.number_field :min_applicant_educations, label: false
+        %td minimum number of education degrees
+
+    - if applicant.wizard_step_keys.include?(:course_amounts)
+      %tr
+        %td= applicant.wizard_step_title(:course_amounts)
+        %td= f.number_field :min_applicant_courses, label: false
+        %td minimum number of courses
+
+    - if applicant.wizard_step_keys.include?(:experience)
+      %tr
+        %td= applicant.wizard_step_title(:experience)
+        %td= f.number_field :min_applicant_experiences_months, label: false
+        %td minimimum months of work experience
+
+    - if applicant.wizard_step_keys.include?(:endorsements)
+      %tr
+        %td= applicant.wizard_step_title(:endorsements)
+        %td= f.number_field :min_applicant_endorsements, label: false
+        %td minimimum number of endorsements
+
+    - if applicant.wizard_step_keys.include?(:equivalences)
+      %tr
+        %td= applicant.wizard_step_title(:equivalences)
+        %td= f.number_field :min_applicant_equivalences, label: false
+        %td minimimum number of equivalent memberships
+
+    - if applicant.wizard_step_keys.include?(:references)
+      %tr
+        %td= applicant.wizard_step_title(:references)
+        %td= f.number_field :min_applicant_references, label: false
+        %td minimimum number of references
+
+    - if applicant.wizard_step_keys.include?(:files)
+      %tr
+        %td= applicant.wizard_step_title(:files)
+        %td= f.number_field :min_applicant_files, label: false
+        %td minimimum number of attached files
+
+    - if applicant.wizard_step_keys.include?(:cpd)
+      %tr
+        %td= applicant.wizard_step_title(:cpd)
+        %td= f.select :applicant_cpd_step_requirement, f.object.class.cpd_step_requirements, label: false
+        %td
+          minimum required
+          = ets(EffectiveCpd.CpdStatement)

data/app/views/admin/categories/_fields_applicant_steps.html.haml

@@ -0,0 +1,4 @@
+%p The following wizard steps will be displayed when applying for this #{et(Effective::Category)}
+
+- f.object.applicant_wizard_steps += EffectiveMemberships.Applicant.required_wizard_steps
+= f.checks :applicant_wizard_steps, f.object.applicant_wizard_steps_collection(), label: false

data/app/views/admin/categories/_fields_fee_payment_requirements.html.haml

@@ -0,0 +1,11 @@
+- fee_payment = EffectiveMemberships.FeePayment.new
+
+%table.table.table-sm
+  %tbody
+    - if fee_payment.wizard_step_keys.include?(:cpd)
+      %tr
+        %td= fee_payment.wizard_step_title(:cpd)
+        %td= f.select :fee_payment_cpd_step_requirement, f.object.class.cpd_step_requirements, label: false
+        %td
+          minimum required
+          = ets(EffectiveCpd.CpdStatement)

data/app/views/admin/categories/_fields_fee_payment_steps.html.haml

@@ -0,0 +1,4 @@
+%p The following wizard steps will be displayed when applying for this #{et(Effective::FeePayment)}
+
+- f.object.fee_payment_wizard_steps += EffectiveMemberships.FeePayment.required_wizard_steps
+= f.checks :fee_payment_wizard_steps, f.object.fee_payment_wizard_steps_collection(), label: false

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

@@ -6,17 +6,15 @@
       = render 'admin/categories/form_fees', category: category
 
   - if category.persisted?
+    = tab 'Wizards' do
+      = render 'admin/categories/form_wizards', category: category
+
     = tab 'Content - Applicants' do
       = render 'admin/categories/form_applicant_content', category: category
 
     = tab 'Content - Renewals' do
       = render 'admin/categories/form_fee_payment_content', category: category
 
-    = tab 'Wizards' do
-      .row
-        .col= render 'admin/categories/form_applicant_steps', category: category
-        .col= render 'admin/categories/form_fee_payment_steps', category: category
-
     - if category.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(category.log_changes_datatable)

data/app/views/admin/categories/_form_wizards.html.haml

@@ -0,0 +1,16 @@
+= effective_form_with(model: [:admin, category], engine: true) do |f|
+  .row
+    .col
+      = card(et(EffectiveMemberships.Applicant) + ' Wizard Steps') do
+        = render 'admin/categories/fields_applicant_steps', f: f
+
+      = card(et(EffectiveMemberships.Applicant) + ' Requirements') do
+        = render 'admin/categories/fields_applicant_requirements', f: f
+    .col
+      = card(et(EffectiveMemberships.FeePayment) + ' Wizard Steps') do
+        = render 'admin/categories/fields_fee_payment_steps', f: f
+
+      = card(et(EffectiveMemberships.FeePayment) + ' Requirements') do
+        = render 'admin/categories/fields_fee_payment_requirements', f: f
+
+  = f.submit

data/app/views/effective/applicant_endorsements/complete.html.haml

@@ -1,2 +1,2 @@
 = card do
-  %p Thank you. The confidential endorsement has been completed.
+  %p.text-center Thank you. The confidential endorsement has been completed.

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

@@ -23,8 +23,9 @@
     label: "Do you have any reservations about the applicant?", inline: true, required: true
 
   = f.show_if :reservations, true do
-    = f.text_area :reservations_reason,
-      label: 'Please provide a brief but candid explanation of your reservations'
+    .mt-2
+      = f.text_area :reservations_reason,
+        label: 'Please provide a brief but candid explanation of your reservations'
 
   .mt-4
 

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

@@ -1,2 +1,2 @@
 = card do
-  %p Thank you. The confidential reference has been completed.
+  %p.text-center Thank you. The confidential reference has been completed.

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

@@ -0,0 +1,3 @@
+= wizard_card(applicant) do
+  = render('effective/wizard_steps/cpd_statements', resource: applicant)
+  = render('effective/wizard_steps/cpd_requirements', resource: applicant)

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

@@ -0,0 +1,2 @@
+- # Intentionally blank
+%p TODO

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

@@ -0,0 +1,5 @@
+= f.check_box :declare_code_of_ethics,
+  label: 'Yes, I hereby certify that I have read and will adhere to the Code of Ethics'
+
+= f.check_box :declare_truth,
+  label: 'Yes, I hereby certify that the statements and information contained herein are correct'

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

@@ -0,0 +1 @@
+%p Please provide the names individuals who can speak to your character and reputation.

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

@@ -0,0 +1,20 @@
+= render 'layout' do
+  = render 'effective/applicants/content', resource: resource
+
+  = card(et('effective_cpd.name')) do
+    = render('cpd_requirements', applicant: resource)
+
+  = card('All ' + cpd_statements_label) do
+    = render('effective/wizard_steps/cpd_statements', resource: resource)
+
+  = card('Requirements') do
+    = render('effective/wizard_steps/cpd_requirements', resource: resource)
+
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
+
+      - f.object.declare_cpd = true if f.object.has_completed_step?(:cpd)
+      = render('effective/wizard_steps/cpd_fields', f: f)
+
+      = f.save 'Save and Continue'

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

@@ -9,12 +9,6 @@
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
-      = f.check_box :declare_code_of_ethics,
-        label: 'Yes, I hereby certify that I have read and will adhere to the Code of Ethics'
-
-      = f.check_box :declare_truth,
-        label: 'Yes, I hereby certify that the statements and information contained herein are correct'
-
-      = render_if_exists("effective/applicants/declarations_fields", f: f)
+      = render("effective/applicants/declarations_fields", f: f)
 
       = f.save 'Save and Continue'

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

@@ -4,11 +4,13 @@
   = card do
     - if resource.min_applicant_files > 0
       %p You must include #{resource.min_applicant_files} or more files.
+    - else
+      %p Please add zero or more files.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
-      = f.file_field :applicant_files, attachment_style: :table
+      = f.file_field :applicant_files, attachment_style: :table, label: 'Files'
 
       = render_if_exists("effective/applicants/files_fields", f: f)
 

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

@@ -2,8 +2,12 @@
   = render 'effective/applicants/content', resource: resource
 
   = card do
+    .mb-2= render('references_requirements', applicant: resource)
+
     - if resource.min_applicant_references > 0
       %p You must include #{resource.min_applicant_references} or more references.
+    - else
+      %p Please include zero or more references.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

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

@@ -7,6 +7,8 @@
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
 
+      - f.object.declare_will_send_transcripts = true if f.object.has_completed_step?(:transcripts)
+
       = f.check_box :declare_will_send_transcripts,
         label: "Yes, I will request my transcripts be sent directly from the insitiution to the registrar.", required: true
 

data/app/views/effective/wizard_steps/_cpd_fields.html.haml

@@ -0,0 +1,3 @@
+- # This is a shared partial for the CPD Step on Applicants and FeePayments
+
+= f.check_box :declare_cpd, label: "Yes, my #{et('effective_cpd.name')} (#{et('effective_cpd.acronym')}) requirements are complete"

data/app/views/effective/wizard_steps/_cpd_requirements.html.haml

@@ -0,0 +1,15 @@
+- # This is a shared partial for the CPD Step on Applicants and FeePayments
+
+- if resource.cpd_required_cpd_cycles.blank?
+  %p You are not required to submit a #{cpd_statement_label} at this time.
+
+- elsif resource.cpd_uncompleted_cpd_cycles.blank?
+  %p Thank you! All required #{cpd_statements_label} have been completed.
+
+- elsif resource.cpd_uncompleted_cpd_cycles.present?
+  %p You must submit a #{cpd_statement_label} for the following #{cpd_cycles_label} before you may continue:
+
+  - resource.cpd_uncompleted_cpd_cycles.each do |cpd_cycle|
+    %p= link_to("#{cpd_cycle}", effective_cpd.cpd_cycle_cpd_statement_build_path(cpd_cycle, :new, :start), target: '_blank')
+
+  %p Please complete any required #{cpd_statements_label} then return here.

data/app/views/effective/wizard_steps/_cpd_statements.html.haml

@@ -0,0 +1,15 @@
+- # This is a shared partial for the CPD Step on Applicants and FeePayments
+
+- available = EffectiveCpdAvailableCyclesDatatable.new(self, user: resource.user) unless resource.try(:was_submitted?)
+- completed = EffectiveCpdCompletedStatementsDatatable.new(self, user: resource.user)
+
+- if available.present?
+  %p The following #{cpd_cycles_label} are available:
+  = render_datatable(available, simple: true)
+
+- if available.present? && completed.present?
+  .my-2
+
+- if completed.present?
+  %p The following #{cpd_statements_label} have been completed:
+  = render_datatable(completed, simple: true)

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

@@ -16,12 +16,11 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.boolean :can_apply_restricted, default: false
       t.text :can_apply_restricted_ids
 
-      t.text :applicant_wizard_steps
       t.integer :applicant_fee
       t.integer :applicant_reinstatement_fee
+      t.text :applicant_wizard_steps
 
-      t.text :applicant_review_wizard_steps
-
+      t.string :applicant_cpd_step_requirement
       t.integer :min_applicant_educations
       t.integer :min_applicant_experiences_months
       t.integer :min_applicant_references
@@ -31,8 +30,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :min_applicant_files
 
       t.integer :min_applicant_reviews
-
-      t.text :fee_payment_wizard_steps
+      t.text :applicant_review_wizard_steps
 
       t.integer :prorated_jan
       t.integer :prorated_feb
@@ -48,6 +46,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :prorated_dec
 
       # Renewals
+      t.text :fee_payment_wizard_steps
+      t.string :fee_payment_cpd_step_requirement
+
       t.boolean :create_renewal_fees, default: false
       t.integer :renewal_fee
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.13.4'
+  VERSION = '0.13.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-03 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -369,13 +369,17 @@ files:
 - app/views/admin/categories/_fees_late.html.haml
 - app/views/admin/categories/_fees_nigs.html.haml
 - app/views/admin/categories/_fees_renewal.html.haml
+- app/views/admin/categories/_fields_applicant_requirements.html.haml
+- app/views/admin/categories/_fields_applicant_steps.html.haml
+- app/views/admin/categories/_fields_fee_payment_requirements.html.haml
+- app/views/admin/categories/_fields_fee_payment_steps.html.haml
 - app/views/admin/categories/_form.html.haml
 - app/views/admin/categories/_form_applicant_content.html.haml
 - app/views/admin/categories/_form_applicant_steps.html.haml
 - app/views/admin/categories/_form_category.html.haml
 - app/views/admin/categories/_form_fee_payment_content.html.haml
-- app/views/admin/categories/_form_fee_payment_steps.html.haml
 - app/views/admin/categories/_form_fees.html.haml
+- app/views/admin/categories/_form_wizards.html.haml
 - app/views/admin/documents/_form.html.haml
 - app/views/admin/fee_payments/_fee_payment.html.haml
 - app/views/admin/fees/_fee.html.haml
@@ -431,8 +435,11 @@ files:
 - app/views/effective/applicants/_applicant.html.haml
 - app/views/effective/applicants/_content.html.haml
 - app/views/effective/applicants/_course_amounts.html.haml
+- app/views/effective/applicants/_cpd.html.haml
+- app/views/effective/applicants/_cpd_requirements.html.haml
 - app/views/effective/applicants/_dashboard.html.haml
 - app/views/effective/applicants/_declarations.html.haml
+- app/views/effective/applicants/_declarations_fields.html.haml
 - app/views/effective/applicants/_demographics.html.haml
 - app/views/effective/applicants/_education.html.haml
 - app/views/effective/applicants/_endorsements.html.haml
@@ -445,6 +452,7 @@ files:
 - app/views/effective/applicants/_organization.html.haml
 - app/views/effective/applicants/_owner.html.haml
 - app/views/effective/applicants/_references.html.haml
+- app/views/effective/applicants/_references_requirements.html.haml
 - app/views/effective/applicants/_reinstatement.html.haml
 - app/views/effective/applicants/_select.html.haml
 - app/views/effective/applicants/_select_organization.html.haml
@@ -455,6 +463,7 @@ files:
 - app/views/effective/applicants/billing.html.haml
 - app/views/effective/applicants/checkout.html.haml
 - app/views/effective/applicants/course_amounts.html.haml
+- app/views/effective/applicants/cpd.html.haml
 - app/views/effective/applicants/declarations.html.haml
 - app/views/effective/applicants/demographics.html.haml
 - app/views/effective/applicants/education.html.haml
@@ -517,6 +526,9 @@ files:
 - app/views/effective/organizations/_form_organization.html.haml
 - app/views/effective/representatives/_form.html.haml
 - app/views/effective/representatives/_user_fields.html.haml
+- app/views/effective/wizard_steps/_cpd_fields.html.haml
+- app/views/effective/wizard_steps/_cpd_requirements.html.haml
+- app/views/effective/wizard_steps/_cpd_statements.html.haml
 - app/views/organizations/_demographics.html.haml
 - app/views/organizations/_fields_demographics.html.haml
 - app/views/users/_demographics.html.haml

data/app/views/admin/categories/_form_fee_payment_steps.html.haml

@@ -1,6 +0,0 @@
-= effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Renewal Wizard Steps
-  - f.object.fee_payment_wizard_steps += EffectiveMemberships.FeePayment.required_wizard_steps
-  = f.checks :fee_payment_wizard_steps, f.object.fee_payment_wizard_steps_collection(), label: false
-
-  = f.submit