effective_memberships 0.3.14 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa55f7742a08e8756e0b3db669d79875ac368f92c0b0363a04975ce1aa201b13
-  data.tar.gz: 5b664867bf6a689067f160141f0718b376b5b98f03be4dfa927ee285f295111e
+  metadata.gz: 885423c81ffcee648c3ad06826b943ed31f9ed059432e9eda6a55b24a0f07ec0
+  data.tar.gz: 3b7c8ed91242b0cd0648cdca9f5e9b70af40bc5f7be7fb3ad585dfbe147c7909
 SHA512:
-  metadata.gz: 4a9dbe5ec6aec0b9fd1a5e446aa36cede071772da8bc2ac801316224b92c61fcd4807704da4c69ae65135ef48861abf82328d3ed2113970b5cf6a7a6015e3493
-  data.tar.gz: 3b94e9838b8a70f9e18f0924ff6d8d67d9554a2c091181114d09e8a5bd714712a3daabc23a243bc3a1e373083f15c861557bcbd1a915b009225518b158daf195
+  metadata.gz: 57654df20abfb3444de50023ea70cc011a28254ac8e986b54b158dc171fffb5c49c4b560128fe6d9ca937fb5f143031c4d4e3eaa372a12cede3968e476de1dfe
+  data.tar.gz: b15c8258ebfbeb653bf4cf5745ef0f63ded375c4326ed32ac5050f6adb7a4d92d6c79d35e914b288d1dbad70f0547e912379783224ef0b737bb6923f334c6029

data/app/controllers/admin/membership_histories_controller.rb

@@ -0,0 +1,24 @@
+module Admin
+  class MembershipHistoriesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    submit :save, 'Update History',
+      success: -> { "Membership history successfully updated. Please double check the history is correct." },
+      redirect: -> { admin_owners_path(resource) }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_membership_history) ? :effective_membership_history : :membership_history)
+      params.require(model).permit!
+    end
+
+    def admin_owners_path(resource)
+      Effective::Resource.new(resource.owner, namespace: :admin).action_path(:edit) + '?tab=membership'
+    end
+
+  end
+end

data/app/controllers/admin/memberships_controller.rb

@@ -5,5 +5,20 @@ module Admin
 
     include Effective::CrudController
 
+    submit :save, 'Update Membership',
+      success: -> { "#{resource.owner} has been successfully updated. Please double check the membership history is correct" },
+      redirect: -> { admin_owners_path(resource) }
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_membership) ? :effective_membership : :membership)
+      params.require(model).permit!
+    end
+
+    def admin_owners_path(resource)
+      Effective::Resource.new(resource.owner, namespace: :admin).action_path(:edit) + '?tab=membership'
+    end
+
   end
 end

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::EffectiveOrganizationsDatatable').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_applicant_references_datatable.rb

@@ -1,31 +1,33 @@
-class Admin::EffectiveApplicantReferencesDatatable < Effective::Datatable
+module Admin
+  class EffectiveApplicantReferencesDatatable < Effective::Datatable
 
-  datatable do
-    order :name
+    datatable do
+      order :name
 
-    col :applicant
+      col :applicant
 
-    col :name
-    col :email
-    col :phone
+      col :name
+      col :email
+      col :phone
 
-    col :status do |reference|
-      if reference.submitted?
-        'Waiting on response'
-      elsif reference.completed?
-        'Completed'
+      col :status do |reference|
+        if reference.submitted?
+          'Waiting on response'
+        elsif reference.completed?
+          'Completed'
+        end
+      end
+
+      col :last_notified_at do |reference|
+        reference.last_notified_at&.strftime('%F') unless reference.completed?
       end
-    end
 
-    col :last_notified_at do |reference|
-      reference.last_notified_at&.strftime('%F') unless reference.completed?
+      actions_col
     end
 
-    actions_col
-  end
+    collection do
+      Effective::ApplicantReference.deep.all
+    end
 
-  collection do
-    Effective::ApplicantReference.deep.all
   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_fees_datatable.rb

@@ -49,8 +49,8 @@ module Admin
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 
-      if attributes[:owner_id]
-        scope = scope.where(owner_id: attributes[:owner_id])
+      if attributes[:owner_id] && attributes[:owner_type]
+        scope = scope.where(owner_id: attributes[:owner_id], owner_type: attributes[:owner_type])
       end
 
       if attributes[:applicant_id]

data/app/datatables/admin/effective_membership_histories_datatable.rb

@@ -12,8 +12,6 @@ module Admin
 
       col :owner
 
-      col :number
-
       col :categories, label: 'Category' do |history|
         history.categories.map.with_index do |category, index|
           category_id = history.category_ids[index]
@@ -23,6 +21,8 @@ module Admin
         end.join.html_safe
       end
 
+      col :number
+
       col :category_ids, visible: false
 
       col :bad_standing
@@ -35,7 +35,11 @@ module Admin
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 
       scope = Effective::MembershipHistory.deep.all
-      scope = scope.where(owner_id: attributes[:owner_id]) if attributes[:owner_id]
+
+      if attributes[:owner_id] && attributes[:owner_type]
+        scope = scope.where(owner_id: attributes[:owner_id], owner_type: attributes[:owner_type])
+      end
+
       scope
     end
 

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -69,8 +69,8 @@ module Admin
 
       raise('expected an owner_id, not user_id') if attributes[:user_id].present?
 
-      if attributes[:owner_id].present?
-        memberships = memberships.where(owner_id: attributes[:owner_id])
+      if attributes[:owner_id].present? && attributes[:owner_type].present?
+        memberships = memberships.where(owner_id: attributes[:owner_id], owner_type: attributes[:owner_type])
       end
 
       memberships

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 = {