effective_memberships 0.3.13 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38134acc9619d9ea0404332803f0c17535fee985688ddcc628db39c1cbf9987c
-  data.tar.gz: 781c42e6cdeb6c501aa696c1a13bc9917db90c5090b05a845754b2547b4a9689
+  metadata.gz: 2648e82170c5076854831eebdbaf7f972cbfeaf69076280253ad345ca1ac53db
+  data.tar.gz: 385ddec71ae2103c4f33c08dd732b52b13f87535b0a44c11131389c47b854703
 SHA512:
-  metadata.gz: 6ea602b5671e84066f96d77d996c08f6524ff46659ff1ede3b0b730a133c95693aa83b1e4dbf837b06f271c8d01ee73fa9c1c44528a2fd4bb3b3e10123e60888
-  data.tar.gz: dc6909b2b20ef4db2200be6cd8bcbf2bcc2ea5492e2c745ae64b48158b4092b78db8305b43d0ae46f2fa800e41767bbb1faf9ad13a9547b0676b3dd8ff283520
+  metadata.gz: a581b0e79010b252b6e12cf3763d67eee879da8e4661f06c456b037dbcb220c1640d424f246c9d8a210e5d89acfe098fd61cc8a39d947aed46b30ca270ce934c
+  data.tar.gz: e45c087b0f7f9ea6fa7c2f03593b43da7a6d4451e39447d29ebdc7053422856b97dae45a28977cfb759170d5f278fb3046821070072176050fb551e07a1c4ccb

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

@@ -1,49 +1,68 @@
 module Effective
   class MembershipsMailer < EffectiveMemberships.parent_mailer_class
 
+    include EffectiveMailer
     include EffectiveEmailTemplatesMailer if EffectiveMemberships.use_effective_email_templates
 
-    default from: -> { EffectiveMemberships.mailer_sender }
-    layout -> { EffectiveMemberships.mailer_layout }
-
     def applicant_completed(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Completed', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_missing_info(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Missing Info', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_approved(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Approved', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_declined(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.owner.email, **headers_for(resource, opts))
+      @applicant = resource
+
+      subject = subject_for(__method__, 'Applicant Declined', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     def applicant_reference_notification(resource, opts = {})
       @assigns = assigns_for(resource)
-      mail(to: resource.email, **headers_for(resource, opts))
-    end
+      @applicant_reference = resource
 
-    protected
+      subject = subject_for(__method__, 'Reference Requested', resource, opts)
+      headers = headers_for(resource, opts)
 
-    def headers_for(resource, opts = {})
-      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+      mail(to: resource.email, subject: subject, **headers)
     end
 
+    protected
+
     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')
@@ -80,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 = {