effective_memberships 0.3.14 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa55f7742a08e8756e0b3db669d79875ac368f92c0b0363a04975ce1aa201b13
-  data.tar.gz: 5b664867bf6a689067f160141f0718b376b5b98f03be4dfa927ee285f295111e
+  metadata.gz: 223d0bdf9ce08beacd79d4fdeb3e184878bb9e9cdb8b5964aa1c4ace9f1d2735
+  data.tar.gz: 158b570a8dc933b247245e450c74a78c63877ece8f35a59b1e400b0fdb017b43
 SHA512:
-  metadata.gz: 4a9dbe5ec6aec0b9fd1a5e446aa36cede071772da8bc2ac801316224b92c61fcd4807704da4c69ae65135ef48861abf82328d3ed2113970b5cf6a7a6015e3493
-  data.tar.gz: 3b94e9838b8a70f9e18f0924ff6d8d67d9554a2c091181114d09e8a5bd714712a3daabc23a243bc3a1e373083f15c861557bcbd1a915b009225518b158daf195
+  metadata.gz: b8e3fe9641f2826a4df557f1817163d719bb53112a835b3a5456ea7020283f360e4bcdc99d75c1a79256f6515b2fa05f5a2c0001b6eb1ecfa988dd09eba8eb5d
+  data.tar.gz: 013d39152828dce9d873e1eb1f1bb9f3a42aa83fc31105e020adbd47734f42902eec0659ff661b1fd4e8bd1983a389374848847221b6aec35dcbb8bfb5552661

data/app/controllers/admin/organizations_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class OrganizationsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.Organization.deep.all }
+    datatable -> { EffectiveResources.best('Admin::EffectiveMembershipsDatatable').new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_organization) ? :effective_organization : :organization)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/controllers/admin/representatives_controller.rb

@@ -0,0 +1,19 @@
+module Admin
+  class RepresentativesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    resource_scope -> { Effective::Representative.deep.all }
+    datatable -> { Admin::EffectiveRepresentativesDatatable.new }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_representative) ? :effective_representative : :representative)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/controllers/effective/applicants_controller.rb

@@ -4,9 +4,8 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope -> { EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners) }
-
-    submit :resubmit, 'Submit Application'
+    resource_scope -> { EffectiveMemberships.Applicant.deep.where(user: current_user) }
 
+    submit :resubmit, 'Resubmit Application'
   end
 end

data/app/controllers/effective/fee_payments_controller.rb

@@ -4,7 +4,6 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope -> { EffectiveMemberships.FeePayment.deep.where(owner: current_user.effective_memberships_owners) }
-
+    resource_scope -> { EffectiveMemberships.FeePayment.deep.where(user: current_user) }
   end
 end

data/app/controllers/effective/organizations_controller.rb

@@ -0,0 +1,16 @@
+module Effective
+  class OrganizationsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::CrudController
+
+    resource_scope -> { EffectiveMemberships.Organization.deep.where(id: current_user.organizations) }
+
+    private
+
+    def permitted_params
+      params.require(:organization).permit!
+    end
+
+  end
+end

data/app/controllers/effective/representatives_controller.rb

@@ -0,0 +1,19 @@
+module Effective
+  class RepresentativesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::CrudController
+
+    resource_scope -> {
+      organizations = EffectiveMemberships.Organization.deep.where(id: current_user.organizations)
+      Effective::Representative.deep.where(organization: organizations)
+    }
+
+    private
+
+    def permitted_params
+      params.require(:effective_representative).permit!
+    end
+
+  end
+end

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -26,7 +26,8 @@ module Admin
 
       col :approved_at, label: 'Approved', visible: false, as: :date
 
-      col :owner
+      col :user
+      col :organization
 
       col :applicant_type
       col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
@@ -40,14 +41,18 @@ module Admin
     collection do
       applicants = EffectiveMemberships.Applicant.deep.all
 
-      raise('expected an owner_id, not user_id') if attributes[:user_id].present?
+      raise('expected a user_id or organization_id, not owner_id') if attributes[:owner_id].present?
 
-      if scope == :in_progress && attributes[:owner_id].blank?
+      if scope == :in_progress && attributes[:user_id].blank? && attributes[:organization_id].blank?
         applicants = applicants.where.not(status: :draft)
       end
 
-      if attributes[:owner_id].present?
-        applicants = applicants.where(owner_id: attributes[:owner_id])
+      if attributes[:user_id].present?
+        applicants = applicants.where(user_id: attributes[:owner_id])
+      end
+
+      if attributes[:organization_id].present?
+        applicants = applicants.where(organization_id: attributes[:organization_id])
       end
 
       if attributes[:except_id].present?

data/app/datatables/admin/effective_categories_datatable.rb

@@ -8,13 +8,20 @@ module Admin
       col :id, visible: false
 
       col :title
+      col :can_apply_new, label: 'Can Apply'
       col :applicant_fee, as: :price
+
       col :renewal_fee, as: :price
       col :late_fee, as: :price
       col :rich_text_body, label: 'Body'
       col :tax_exempt
       col :qb_item_name, visible: false
 
+      col :category_type, search: EffectiveMemberships.Category.category_types
+
+      col :optional_applicant_wizard_steps, label: 'Applicant Steps'
+      col :optional_fee_payment_wizard_steps, label: 'Fee Payment Steps'
+
       actions_col
     end
 

data/app/datatables/admin/effective_fee_payments_datatable.rb

@@ -18,7 +18,8 @@ module Admin
       col :period, visible: false
       col :submitted_at, label: 'Submitted', visible: false, as: :date
 
-      col :owner
+      col :user
+      col :organization
 
       col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
 
@@ -27,17 +28,21 @@ module Admin
       actions_col
     end
 
-    collection do
+    collection(apply_belongs_to: false) do
       fee_payments = EffectiveMemberships.FeePayment.deep.all
 
-      raise('expected an owner_id, not user_id') if attributes[:user_id].present?
+      raise('expected an user_id but was given an owner_id') if attributes[:owner_id].present?
 
-      if fee_payments == :in_progress && attributes[:owner_id].blank?
+      if fee_payments == :in_progress && attributes[:user_id].blank? && attributes[:organization_id].blank?
         fee_payments = fee_payments.where.not(status: :draft)
       end
 
-      if attributes[:owner_id].present?
-        fee_payments = fee_payments.where(owner_id: attributes[:owner_id])
+      if attributes[:user_id].present?
+        fee_payments = fee_payments.where(user_id: attributes[:user_id])
+      end
+
+      if attributes[:organization_id].present?
+        fee_payments = fee_payments.where(organization_id: attributes[:organization_id])
       end
 
       if attributes[:except_id].present?

data/app/datatables/admin/effective_organizations_datatable.rb

@@ -0,0 +1,31 @@
+module Admin
+  class EffectiveOrganizationsDatatable < Effective::Datatable
+    datatable do
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+
+      col :id, visible: false
+
+      if categories.present?
+        col :category, search: categories
+      end
+
+      col :title
+
+      col :representatives_count
+      col :representatives
+
+      actions_col
+    end
+
+    collection do
+      EffectiveMemberships.Organization.deep.all
+    end
+
+    def categories
+      EffectiveMemberships.Organization.categories
+    end
+
+  end
+end

data/app/datatables/admin/effective_representatives_datatable.rb

@@ -0,0 +1,28 @@
+module Admin
+  class EffectiveRepresentativesDatatable < Effective::Datatable
+    datatable do
+      col :id, visible: false
+      col :user_id, visible: false
+
+      col :organization
+      col :user
+
+      col :email do |representative|
+        mail_to(representative.user.email)
+      end
+
+      col :roles, search: roles_collection
+
+      actions_col
+    end
+
+    collection do
+      Effective::Representative.deep.all
+    end
+
+    def roles_collection
+      EffectiveRoles.roles_collection(Effective::Representative.new).map(&:second)
+    end
+
+  end
+end

data/app/datatables/effective_applicants_datatable.rb

@@ -34,7 +34,7 @@ class EffectiveApplicantsDatatable < Effective::Datatable
   end
 
   collection do
-    EffectiveMemberships.Applicant.deep.where(owner: current_user.effective_memberships_owners)
+    EffectiveMemberships.Applicant.deep.for(current_user)
   end
 
 end

data/app/datatables/effective_fee_payments_datatable.rb

@@ -6,7 +6,9 @@ class EffectiveFeePaymentsDatatable < Effective::Datatable
     col :token, visible: false
     col :created_at, visible: false
 
-    col :owner
+    col :user
+    col :organization
+
     col :status, visible: false
     col :submitted_at, label: 'Submitted', as: :date
     col :period, visible: false
@@ -16,9 +18,8 @@ class EffectiveFeePaymentsDatatable < Effective::Datatable
     actions_col(new: false)
   end
 
-  collection do
-    EffectiveMemberships.FeePayment.deep.done
-      .where(owner: current_user.effective_memberships_owners)
+  collection(apply_belongs_to: false) do
+    scope = EffectiveMemberships.FeePayment.deep.done.for(current_user)
   end
 
 end

data/app/datatables/effective_organizations_datatable.rb

@@ -0,0 +1,18 @@
+# Dashboard Organizations
+class EffectiveOrganizationsDatatable < Effective::Datatable
+  datatable do
+    order :title
+
+    col :id, visible: false
+
+    col :title
+    col :representatives
+
+    actions_col
+  end
+
+  collection do
+    EffectiveMemberships.Organization.deep.where(id: current_user.organizations)
+  end
+
+end

data/app/datatables/effective_representatives_datatable.rb

@@ -0,0 +1,40 @@
+class EffectiveRepresentativesDatatable < Effective::Datatable
+  datatable do
+    col :id, visible: false
+
+    col :organization
+    col :user
+
+    unless attributes[:user_id]
+      col :email do |representative|
+        mail_to(representative.user.email)
+      end
+    end
+
+    col :roles, search: roles_collection
+
+    unless attributes[:actions] == false
+      actions_col
+    end
+
+  end
+
+  collection do
+    scope = Effective::Representative.deep.all.where(organization: current_user.organizations)
+
+    if attributes[:organization_id]
+      scope = scope.where(organization_id: attributes[:organization_id])
+    end
+
+    if attributes[:user_id]
+      scope = scope.where(user_id: attributes[:user_id])
+    end
+
+    scope
+  end
+
+  def roles_collection
+    EffectiveRoles.roles_collection(Effective::Representative.new).map(&:second)
+  end
+
+end

data/app/helpers/effective_memberships_helper.rb

@@ -8,4 +8,29 @@ module EffectiveMembershipsHelper
     end.compact
   end
 
+  def effective_memberships_select_applicant_organization_collection(resource)
+    user = (resource.respond_to?(:user) ? resource.user : resource)
+    raise('expected an effective memberships user') unless user.class.try(:effective_memberships_user?)
+
+    representatives = user.representatives.select { |rep| rep.is?(:owner) || rep.is?(:billing) }
+    organizations = representatives.map { |rep| [rep.organization.to_s, rep.organization.id] }
+
+    organizations + [['New Organization...', 'new']]
+  end
+
+  # This is the select yourself or organization field on FeePayments#start
+  def effective_memberships_select_fee_payment_organization(resource)
+    user = (resource.respond_to?(:user) ? resource.user : resource)
+    raise('expected an effective memberships user') unless user.class.try(:effective_memberships_user?)
+
+    owners = user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
+
+    owners.map do |owner|
+      [
+        owner.to_s,
+        (owner.to_param if owner.kind_of?(EffectiveMemberships.Organization)) # Nil when user
+      ]
+    end
+  end
+
 end

data/app/mailers/effective/memberships_mailer.rb

@@ -11,7 +11,7 @@ module Effective
       subject = subject_for(__method__, 'Applicant Completed', resource, opts)
       headers = headers_for(resource, opts)
 
-      mail(to: resource.owner.email, subject: subject, **headers)
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_missing_info(resource, opts = {})
@@ -21,7 +21,7 @@ module Effective
       subject = subject_for(__method__, 'Applicant Missing Info', resource, opts)
       headers = headers_for(resource, opts)
 
-      mail(to: resource.owner.email, subject: subject, **headers)
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_approved(resource, opts = {})
@@ -31,7 +31,7 @@ module Effective
       subject = subject_for(__method__, 'Applicant Approved', resource, opts)
       headers = headers_for(resource, opts)
 
-      mail(to: resource.owner.email, subject: subject, **headers)
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_declined(resource, opts = {})
@@ -41,7 +41,7 @@ module Effective
       subject = subject_for(__method__, 'Applicant Declined', resource, opts)
       headers = headers_for(resource, opts)
 
-      mail(to: resource.owner.email, subject: subject, **headers)
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_reference_notification(resource, opts = {})
@@ -58,11 +58,11 @@ module Effective
 
     def assigns_for(resource)
       if resource.class.respond_to?(:effective_memberships_applicant?)
-        return applicant_assigns(resource).merge(user_assigns(resource.owner))
+        return applicant_assigns(resource).merge(owner_assigns(resource.owner))
       end
 
       if resource.kind_of?(Effective::ApplicantReference)
-        return reference_assigns(resource).merge(user_assigns(resource.applicant.owner))
+        return reference_assigns(resource).merge(owner_assigns(resource.applicant.owner))
       end
 
       raise('unexpected resource')
@@ -99,7 +99,7 @@ module Effective
       { reference: values }
     end
 
-    def user_assigns(owner)
+    def owner_assigns(owner)
       raise('expected a owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
       values = {

data/app/models/concerns/effective_memberships_applicant.rb

@@ -44,7 +44,8 @@ module EffectiveMembershipsApplicant
     acts_as_wizard(
       start: 'Start',
       select: 'Select Application Type',
-      demographics: 'Demographics',
+      demographics: 'Demographics',         # Individual only. Users fields.
+      organization: 'Organization',         # Organization only. Organization fields.
       education: 'Education',
       course_amounts: 'Courses',
       experience: 'Work Experience',
@@ -73,8 +74,11 @@ module EffectiveMembershipsApplicant
     attr_accessor :approved_membership_date
 
     # Application Namespace
-    belongs_to :owner, polymorphic: true
-    accepts_nested_attributes_for :owner
+    belongs_to :user, polymorphic: true
+    accepts_nested_attributes_for :user
+
+    belongs_to :organization, polymorphic: true, optional: true
+    accepts_nested_attributes_for :organization
 
     belongs_to :category, polymorphic: true, optional: true
     belongs_to :from_category, polymorphic: true, optional: true
@@ -142,7 +146,7 @@ module EffectiveMembershipsApplicant
       timestamps
     end
 
-    scope :deep, -> { includes(:owner, :category, :from_category, :orders) }
+    scope :deep, -> { includes(:user, :organization, :category, :from_category, :orders) }
     scope :sorted, -> { order(:id) }
 
     scope :in_progress, -> { where.not(status: [:approved, :declined]) }
@@ -150,14 +154,15 @@ module EffectiveMembershipsApplicant
 
     scope :not_draft, -> { where.not(status: :draft) }
 
-    # Set Apply to Join or Reclassification
-    before_validation(if: -> { new_record? && owner.present? }) do
-      self.applicant_type ||= (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
-      self.from_category ||= owner.membership&.category
-    end
+    scope :for, -> (user) {
+      raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
+      where(user: user).or(where(organization: user.organizations))
+    }
 
-    before_validation(if: -> { current_step == :select && category_id.present? }) do
-      self.category_type ||= EffectiveMemberships.Category.name
+    # Set Apply to Join or Reclassification
+    before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
+      self.applicant_type = (owner.membership.blank? ? 'Apply to Join' : 'Apply to Reclassify')
+      self.from_category = owner.membership&.category
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -165,18 +170,16 @@ module EffectiveMembershipsApplicant
     end
 
     # All Steps validations
-    validates :owner, presence: true
+    validates :user, presence: true
     validates :from_category, presence: true, if: -> { reclassification? }
 
     validate(if: -> { reclassification? }) do
       errors.add(:category_id, "can't reclassify to existing category") if category_id == from_category_id
     end
 
-    # Start Step
-    with_options(if: -> { current_step == :start && owner.present? }) do
-      validate do
-        errors.add(:base, 'may not have outstanding fees') if owner.outstanding_fee_payment_fees.present?
-      end
+    validate(if: -> { category.present? }) do
+      self.errors.add(:organization_id, "can't be blank when organization category") if category.organization? && organization.blank?
+      self.errors.add(:organization_id, "must be blank when individual category") if category.individual? && organization.present?
     end
 
     # Select Step
@@ -185,6 +188,10 @@ module EffectiveMembershipsApplicant
       validates :category, presence: true
     end
 
+    validate(if: -> { current_step == :select && owner.present? }) do
+      self.errors.add(:base, 'may not have outstanding fees') if owner.outstanding_fee_payment_fees.present?
+    end
+
     # Applicant Educations Step
     with_options(if: -> { current_step == :education }) do
       validate do
@@ -291,6 +298,14 @@ module EffectiveMembershipsApplicant
 
         # Special logic for stamp step
         applicant_steps.delete(:stamp) unless apply_to_join?
+        applicant_steps.delete(:organization) unless category&.organization?
+
+        # change_wizard_steps is defined in effective_resources acts_as_wizard
+        applicant_steps = change_wizard_steps(applicant_steps)
+
+        unless applicant_steps.kind_of?(Array) && applicant_steps.all? { |step| step.kind_of?(Symbol) }
+          raise('expected change_wizard_steps to return an Array of steps with no nils')
+        end
 
         wizard_steps.select do |step|
           required_steps.include?(step) || category.blank? || applicant_steps.include?(step)
@@ -370,6 +385,18 @@ module EffectiveMembershipsApplicant
     end
   end
 
+  def owner
+    organization || user
+  end
+
+  def owner_symbol
+    organization? ? :organization : :user
+  end
+
+  def build_organization(params = {})
+    self.organization = EffectiveMemberships.Organization.new(params)
+  end
+
   def apply_to_join?
     applicant_type == 'Apply to Join'
   end
@@ -378,8 +405,12 @@ module EffectiveMembershipsApplicant
     applicant_type == 'Apply to Reclassify'
   end
 
-  def owner_label
-    owner_type.to_s.split('::').last
+  def individual?
+    !(owner.kind_of?(EffectiveMemberships.Organization) && category&.organization?)
+  end
+
+  def organization?
+    owner.kind_of?(EffectiveMemberships.Organization) && category&.organization?
   end
 
   def in_progress?
@@ -399,9 +430,11 @@ module EffectiveMembershipsApplicant
     when 'draft'
       "Applicant has not yet completed the #{category} wizard steps or paid to submit this application. This application will transition to 'submitted' after payment has been collected."
     when 'submitted'
-      summary = "Application has been purchased and submitted. The following tasks must be done before this application will transition to 'completed':"
+      summary = "Application has been purchased and submitted."
+      tasks = "The following tasks remain before it can be completed:"
+      approval = "Waiting on approval."
       items = completed_requirements.map { |item, done| "<li>#{item}: #{done ? 'Complete' : 'Incomplete'}</li>" }.join
-      "<p>#{summary}</p><ul>#{items}</ul>"
+      completed_requirements.present? ? "<p>#{summary} #{tasks}</p><ul>#{items}</ul>" : "#{summary} #{approval}"
     when 'completed'
       if applicant_reviews_required?
         "All required materials have been provided. This application will transition to 'reviewed' after all reviewers have voted."
@@ -425,11 +458,11 @@ module EffectiveMembershipsApplicant
   def can_apply_categories_collection
     categories = EffectiveMemberships.Category.sorted.can_apply
 
-    if owner.blank? || owner.membership.blank?
+    if user.blank? || !user.is?(:member)
       return categories.where(can_apply_new: true)
     end
 
-    category_ids = owner.membership.category_ids
+    category_ids = user.memberships.map(&:category_ids).flatten
 
     categories.select do |cat|
       cat.can_apply_existing? ||
@@ -503,10 +536,6 @@ module EffectiveMembershipsApplicant
     )
   end
 
-  # The submit! method used to be here
-  # But it needs to be inside the included do block
-  # So see above. Sorry.
-
   def applicant_references_required?
     min_applicant_references > 0
   end
@@ -514,9 +543,13 @@ module EffectiveMembershipsApplicant
   # When an application is submitted, these must be done to go to completed.
   # An Admin can override this and just set them to completed.
   def completed_requirements
-    {
-      'Applicant References' => (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
-    }
+    if category&.applicant_wizard_steps&.include?(:references) || applicant_references_required?
+      {
+        'Applicant References' => (!applicant_references_required? || applicant_references.count(&:completed?) >= min_applicant_references)
+      }
+    else
+      {}
+    end
   end
 
   def complete!