effective_memberships 0.3.13 → 0.4.1

data/app/models/concerns/effective_memberships_user.rb

@@ -0,0 +1,70 @@
+# EffectiveMembershipsUser
+#
+# Mark your user model with effective_memberships_user to get all the includes
+
+module EffectiveMembershipsUser
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_memberships_user
+      include ::EffectiveMembershipsUser
+    end
+  end
+
+  module ClassMethods
+    def effective_memberships_user?; true; end
+  end
+
+  included do
+    effective_memberships_owner
+
+    # App scoped
+    has_many :applicants, -> { order(:id) }, inverse_of: :user, as: :user
+    has_many :fee_payments, -> { order(:id) }, inverse_of: :user, as: :user
+
+    # Effective Scoped
+    has_many :representatives, -> { Effective::Representative.sorted },
+      class_name: 'Effective::Representative', inverse_of: :user, dependent: :delete_all
+
+    accepts_nested_attributes_for :representatives, allow_destroy: true
+  end
+
+  # Instance Methods
+  def memberships
+    Array(membership) + membership_organizations.map(&:membership)
+  end
+
+  def memberships_owners
+    Array(is?(:member) ? self : nil) + membership_organizations
+  end
+
+  def membership_present?
+    individual_membership_present? || organization_membership_present?
+  end
+
+  def individual_membership_present?
+    membership.present? && !membership.marked_for_destruction?
+  end
+
+  def organization_membership_present?(except: nil)
+    organizations.reject(&:archived?).any? { |organization| organization != except && organization.membership_present? }
+  end
+
+  def representative(organization:)
+    representatives.find { |rep| rep.organization_id == organization.id } if organization
+  end
+
+  # Find or build
+  def build_representative(organization:)
+    representative(organization: organization) || representatives.build(organization: organization)
+  end
+
+  def organizations
+    representatives.reject(&:marked_for_destruction?).map(&:organization)
+  end
+
+  def membership_organizations
+    organizations.select { |organization| organization.is?(:member) && !organization.archived? }
+  end
+
+end

data/app/models/effective/fee.rb

@@ -4,7 +4,7 @@ module Effective
 
     log_changes(to: :owner) if respond_to?(:log_changes)
 
-    # Every fee is charged to a owner
+    # Every fee is charged to a owner: a user or an organization
     belongs_to :owner, polymorphic: true
 
     # This fee may belong to an application, fee payment, or other parent model

data/app/models/effective/organization.rb

@@ -0,0 +1,8 @@
+module Effective
+  class Organization < ActiveRecord::Base
+    self.table_name = EffectiveMemberships.organizations_table_name.to_s
+
+    effective_memberships_organization
+
+  end
+end

data/app/models/effective/registrar_action.rb

@@ -20,6 +20,12 @@ module Effective
     # Assign
     attr_accessor :category_ids
 
+    # Mark Fees Paid - Order Attributes
+    attr_accessor :payment_provider
+    attr_accessor :payment_card
+    attr_accessor :note_to_buyer
+    attr_accessor :note_internal
+
     # All Action Validations
     validates :current_action, presence: true
     validates :current_user, presence: true
@@ -65,7 +71,7 @@ module Effective
 
     def fees_paid!
       update!(current_action: :fees_paid)
-      EffectiveMemberships.Registrar.fees_paid!(owner)
+      EffectiveMemberships.Registrar.fees_paid!(owner, order_attributes: order_attributes)
     end
 
     def remove!
@@ -103,6 +109,15 @@ module Effective
       EffectiveMemberships.Category.where(id: @category_ids) if @category_ids
     end
 
+    def order_attributes
+      {
+        payment_provider: @payment_provider.presence,
+        payment_card: @payment_card.presence,
+        note_to_buyer: @note_to_buyer.presence,
+        note_internal: @note_internal.presence
+      }.compact
+    end
+
     def skip_fees?
       EffectiveResources.truthy?(@skip_fees)
     end

data/app/models/effective/representative.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Effective
+  class Representative < ActiveRecord::Base
+    attr_accessor :new_representative_user_action
+
+    acts_as_role_restricted
+
+    log_changes(to: :organization) if respond_to?(:log_changes)
+
+    belongs_to :organization, polymorphic: true, counter_cache: true
+    belongs_to :user, polymorphic: true
+
+    accepts_nested_attributes_for :organization
+    accepts_nested_attributes_for :user
+
+    effective_resource do
+      roles_mask    :integer
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:id) }
+    scope :deep, -> { includes(:user, :organization) }
+
+    before_validation(if: -> { user && user.new_record? }) do
+      user.password ||= SecureRandom.base64(12) + '!@#123abcABC-'
+    end
+
+    after_commit(on: [:create, :destroy], if: -> { user.class.respond_to?(:effective_memberships_owner?) }) do
+      user.representatives.reload
+      user.update_member_role!
+    end
+
+    validates :organization, presence: true
+    validates :user, presence: true
+
+    validates :user_id, if: -> { user_id && user_type && organization_id && organization_type },
+      uniqueness: { scope: [:organization_id, :organization_type], message: 'already belongs to this organization' }
+
+    def to_s
+      user.to_s
+    end
+
+    def build_user(attributes = {})
+      raise('please assign user_type first') if user_type.blank?
+      self.user = user_type.constantize.new(attributes)
+    end
+
+    def build_organization(attributes = {})
+      raise('please assign organization_type first') if organization_type.blank?
+      self.organization = organization_type.constantize.new(attributes)
+    end
+
+  end
+end

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

@@ -2,7 +2,7 @@
   %h3 Eligibility
   %p Please configure who may apply for this membership category.
 
-  = f.check_box :can_apply_new, label: 'Yes, new users may apply to join'
+  = f.check_box :can_apply_new, label: 'Yes, new applicants may apply to join'
   = f.check_box :can_apply_existing, label: 'Yes, existing members of any category may apply to join'
   = f.check_box :can_apply_restricted, label: 'Only existing members of the following categories may apply to join'
 

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

@@ -14,29 +14,34 @@
 
   %table.table.table-sm
     %tbody
-      %tr
-        %td= applicant.wizard_step_title(:education)
-        %td= f.number_field :min_applicant_educations, label: false
-        %td minimum number of degrees
-
-      %tr
-        %td= applicant.wizard_step_title(:course_amounts)
-        %td= f.number_field :min_applicant_courses, label: false
-        %td minimum number of courses
-
-      %tr
-        %td= applicant.wizard_step_title(:experience)
-        %td= f.number_field :min_applicant_experiences_months, label: false
-        %td minimimum months of work experience
-
-      %tr
-        %td= applicant.wizard_step_title(:references)
-        %td= f.number_field :min_applicant_references, label: false
-        %td minimimum number of references
-
-      %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?(:education)
+        %tr
+          %td= applicant.wizard_step_title(:education)
+          %td= f.number_field :min_applicant_educations, label: false
+          %td minimum number of 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?(: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
 
   = f.submit

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

@@ -1,6 +1,9 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   = f.text_field :title
 
+  = f.select :category_type, f.object.class.category_types,
+    hint: 'When Organization, the organization will be given membership. Otherwise the individual user'
+
   - if f.object.class.categories.present?
     = f.select :category, f.object.class.categories
 

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

@@ -1,6 +1,4 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h2 Renewals
-
   %h3 Renewal Fees
   = f.check_box :create_renewal_fees, label: 'Yes, renewal fees should be created'
 

data/app/views/admin/organizations/_fields.html.haml

@@ -0,0 +1,6 @@
+- categories = EffectiveMemberships.Organization.categories
+
+- if categories.present?
+  = f.select :category, categories, required: true
+
+= f.text_field :title

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

@@ -0,0 +1,31 @@
+= tabs do
+  = tab 'Company Info' do
+    = render 'admin/organizations/form_organization', organization: organization
+
+  - if organization.persisted?
+    - if can?(:index, Effective::Membership)
+      = tab 'Membership' do
+        = render 'admin/registrar_actions/form', owner: organization
+
+    = tab 'Representatives' do
+      = render_datatable(Admin::EffectiveRepresentativesDatatable.new(organization: organization), inline: true, namespace: :admin)
+
+    - if can?(:index, Effective::Fee)
+      = tab 'Fees' do
+        = render_inline_datatable(Admin::EffectiveFeesDatatable.new(owner: organization))
+
+    - if can?(:index, EffectiveMemberships.FeePayment)
+      = tab 'Fee Payments' do
+        = render_inline_datatable(Admin::EffectiveFeePaymentsDatatable.new(organization: organization))
+
+    - if can?(:index, Effective::MembershipHistory)
+      = tab 'History' do
+        = render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: organization))
+
+    - if can?(:index, Effective::Order)
+      = tab 'Orders' do
+        = render_datatable(Admin::EffectiveOrdersDatatable.new(user: organization))
+
+    - if can?(:index, Effective::Log)
+      = tab 'Logs' do
+        = render_datatable(organization.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/organizations/_form_organization.html.haml

@@ -0,0 +1,23 @@
+= effective_form_with(model: [:admin, organization], engine: true) do |f|
+  .row
+    .col-sm-6
+      %h2 Demographics
+      = render 'admin/organizations/fields', f: f
+
+      %h2 Billing Address
+      = effective_address_fields(f, :billing)
+
+    .col-sm-6
+      %h2 Membership
+      = render 'admin/memberships/status', owner: f.object
+
+      - f.object.users.each do |user|
+        %p
+          = link_to(user, "/admin/users/#{user.to_param}/edit")
+          - if user.try(:archived?)
+            %span.badge.badge-warning Archived
+
+      %h2 Admin Only
+      %p No additional fields
+
+  = effective_submit(f)

data/app/views/admin/registrar_actions/_form_fees_paid.html.haml

@@ -25,6 +25,22 @@
       = f.check_box :current_action, label: 'Yes, mark this members fees paid in full'
 
       = f.show_if :current_action, true do
+        - if fees.blank?
+          %p There are no outstanding fee payment fees, so no order will be created.
+        - else
+          %p An order will be created and marked as paid with the following information:
+
+          = f.select :payment_provider, EffectiveOrders.admin_payment_providers, required: true
+
+          = f.text_field :payment_card,
+            label: 'Payment card type, cheque or transaction number',
+            hint: 'Do not enter credit card numbers here, or anywhere.'
+
+          .row
+            .col
+              = f.text_area :note_to_buyer, hint: 'This message will be displayed to the buyer on the receipt.'
+            .col
+              = f.text_area :note_internal, hint: 'For or internal admin use only. This note will never be displayed to the buyer.'
 
         = f.submit 'Mark Fees Paid', border: false, center: true,
           'data-confirm': "Really mark #{f.object.owner} fees paid?"

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

@@ -0,0 +1,38 @@
+= effective_form_with(model: [:admin, representative], engine: true) do |f|
+  - f.object.user_type ||= current_user.class.name
+
+  = f.hidden_field :user_id
+  = f.hidden_field :user_type
+  = f.hidden_field :organization_id
+  = f.hidden_field :organization_type
+
+  - if f.object.new_record?
+    - unless inline_datatable? && inline_datatable.attributes[:organization_id].present?
+      = f.select :organization, { 'Organizations' => EffectiveMemberships.Organization.sorted }, polymorphic: true
+
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+
+    - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.radios :new_representative_user_action, ['Invite new user', 'Add existing user'], inline: true, label: 'Representative'
+
+      = f.show_if :new_representative_user_action, 'Add existing user' do
+        = f.select :user, {'Users' => current_user.class.sorted }, polymorphic: true
+
+      = f.show_if :new_representative_user_action, 'Invite new user' do
+        = f.fields_for :user, (f.object.user || f.object.build_user) do |fu|
+          = render 'admin/representatives/user_fields', f: fu
+
+  - if f.object.persisted?
+    - unless inline_datatable? && inline_datatable.attributes[:organization_id].present?
+      = f.static_field :organization
+
+    - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.static_field :user
+
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
+
+    - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
+      = f.fields_for :user, f.object.user do |fu|
+        = render 'admin/representatives/user_fields', f: fu
+
+  = f.submit

data/app/views/{effective/applicants/_demographics_fields.html.haml → admin/representatives/_user_fields.html.haml}

@@ -1,11 +1,7 @@
+= f.email_field :email
+
 - if f.object.respond_to?(:first_name)
   = f.text_field :first_name
 
 - if f.object.respond_to?(:last_name)
   = f.text_field :last_name
-
-- if f.object.respond_to?(:date_of_birth)
-  = f.date_field :date_of_birth
-
-- if f.object.respond_to?(:phone)
-  = f.tel_field :phone

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

@@ -1,12 +1,31 @@
 - authorized = EffectiveResources.authorized?(self, :new, EffectiveMemberships.Applicant)
 - datatable = EffectiveResources.best('EffectiveApplicantsDatatable').new(self)
-- in_progress = current_user.effective_memberships_owner.applicants.in_progress
 
-- if in_progress.present?
+- # In progress
+- applicant = current_user.applicants.in_progress.first
+
+- if applicant.present? && applicant.draft?
+  %h2 In-Progress Application
+
+  %p
+    Your submission is incomplete.
+
+    %p
+      Please
+      = link_to("Continue application", effective_memberships.applicant_build_path(applicant, applicant.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      or you can
+      = link_to('Abandon application', effective_memberships.applicant_path(applicant), 'data-confirm': "Really delete #{applicant}?", 'data-method': :delete, class: 'btn btn-danger')
+      to apply again.
+
+    %hr
+
+- elsif applicant.present?
   %h2 Active Applications
 
-  - in_progress.each do |applicant|
-    = render 'effective/applicants/summary', applicant: applicant
+  = render 'effective/applicants/summary', applicant: applicant
+  = link_to("View application", effective_memberships.applicant_build_path(applicant, applicant.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+
+  %hr
 
 %h2 Application History
 
@@ -15,5 +34,5 @@
 - else
   %p You have not yet created any applications. When you do, we'll show them here.
 
-- if authorized && in_progress.blank?
+- if authorized && applicant.blank?
   %p= link_to 'Apply to join, reclassify, or provide a change of status notification', effective_memberships.new_applicant_path, class: 'btn btn-primary'

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

@@ -6,4 +6,4 @@
       .col-sm-auto.text-right
         = link_to('Edit', wizard_path(:demographics)) if edit_effective_wizard?
 
-    = render 'effective/applicants/demographics_owner', applicant: applicant, owner: applicant.owner
+    = render 'users/demographics', parent: applicant, user: applicant.user

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

@@ -1,9 +1,11 @@
 %h3 Missing Information
-%p The following information is missing: #{resource.missing_info_reason}.
+%p The following information is missing:
+%ul
+  %li= resource.missing_info_reason
 
 %p
   Please revisit each wizard step and
-  = link_to 'complete all missing information', wizard_path(:demographics)
+  = link_to 'Complete all missing information', wizard_path(:demographics), class: 'btn btn-primary'
   for this application.
 
 %p
@@ -12,7 +14,9 @@
 %p
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :id
-    = f.save 'Submit Application', 'data-confirm': "Really submit application?"
+
+    - # If you change this label, update EffectiveMemberships ApplicantsController
+    = f.save 'Resubmit Application', 'data-confirm': "Really re-submit application?", class: 'btn-sm'
 
 %p
   %small * No additional payment required.

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

@@ -0,0 +1,9 @@
+.card
+  .card-body
+    .row
+      .col-sm
+        %h5.card-title= applicant.wizard_step_title(:organization)
+      .col-sm-auto.text-right
+        = link_to('Edit', wizard_path(:organization)) if edit_effective_wizard?
+
+    = render 'organizations/demographics', parent: applicant, organization: applicant.organization

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

@@ -0,0 +1,21 @@
+%p Please select an organization to continue.
+
+= f.radios :organization_id, effective_memberships_select_applicant_organization_collection(f.object), label: false
+= f.hidden_field :organization_type, value: EffectiveMemberships.Organization.name
+
+= f.show_if(:organization_id, 'new') do
+  - organization = f.object.build_organization(email: f.object.user.email)
+
+  = f.fields_for :organization, organization do |fo|
+    = fo.hidden_field :email
+
+    = fo.text_field :title, label: 'New Organization Name', required: true, hint: 'Please enter the name of your organization'
+
+    = fo.fields_for :representatives, fo.object.build_representative(user: f.object.user) do |fr|
+      = fr.hidden_field :user_id
+      = fr.hidden_field :user_type
+
+      - owner = EffectiveRoles.roles.find { |role| role == :owner }
+      - raise('expected the EffectiveRoles :owner role to be present') unless owner
+
+      = fr.hidden_field :roles, value: [owner]

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

@@ -9,10 +9,18 @@
 
     - if request.path.start_with?('/admin')
       %tr
-        %th= applicant.owner_label
+        %th User
         %td
-          - url = (polymorphic_admin_path(applicant.owner) rescue "/admin/users/#{applicant.owner.to_param}/edit")
-          = link_to(applicant.owner, url)
+          - url = (polymorphic_admin_path(applicant.user) rescue "/admin/users/#{applicant.user.to_param}/edit")
+          = link_to(applicant.user, url)
+
+      %tr
+        %th Organization
+        %td
+          - if applicant.organization.present?
+            = link_to(applicant.organization, effective_memberships.edit_admin_organization_path(applicant.organization))
+          - else
+            None
 
     - if applicant.from_category.present?
       %tr
@@ -21,17 +29,17 @@
 
     %tr
       %th Category
-      %td
-        = applicant.applicant_type
-        %br
-        = applicant.category
+      %td= [applicant.applicant_type, applicant.category].join(' - ')
 
     - if applicant.orders.present?
       %tr
-        %th Orders
+        %th Order#{'s' if applicant.orders.length > 1}
         %td
           - applicant.orders.each do |order|
-            = link_to(order, effective_orders.order_path(order))
+            - if request.path.start_with?('/admin')
+              = link_to(order, effective_orders.edit_admin_order_path(order))
+            - else
+              = link_to(order, effective_orders.order_path(order))
 
     %tr
       %th Status

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

@@ -8,7 +8,7 @@
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id
 
-        = f.fields_for(:owner, f.object.owner) do |fu|
-          = effective_address_fields(fu, :billing)
+        = f.fields_for(f.object.owner_symbol, f.object.owner) do |fo|
+          = effective_address_fields(fo, :billing)
 
         = f.save 'Save and Continue'

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

@@ -1,11 +1,12 @@
 = render 'layout' do
-
   = render 'effective/applicants/content', resource: resource
 
-  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-    = f.hidden_field :id
+  .card
+    .card-body
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
 
-    = f.fields_for(:owner, f.object.owner) do |fu|
-      = render 'effective/applicants/demographics_fields', f: fu
+        = f.fields_for(:user, f.object.user) do |fu|
+          = render 'users/fields_demographics', f: fu, user: f.object.user, parent: resource
 
-    = f.save 'Save and Continue'
+        = f.save 'Save and Continue'

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

@@ -10,7 +10,7 @@
         = f.hidden_field :id
 
         = f.has_many(:applicant_educations, cards: true) do |aef|
-          %h4 Post-Secondary Education
+          %h4.mb-4 Post-Secondary Education
 
           .row
             .col= aef.text_field :institution
@@ -20,7 +20,7 @@
             .col= aef.date_field :start_on, label: 'Start Date'
             .col= aef.date_field :end_on, label: 'End Date'
 
-          = aef.text_field :degree_obtained, label: 'Degree or diploma obtained'
+          = aef.text_field :degree_obtained, label: 'Degree, diploma or program'
 
         /= f.text_area :applicant_educations_details, label: 'Additional Education Details'
 

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

@@ -0,0 +1,19 @@
+= render 'layout' do
+
+  = render 'effective/applicants/content', resource: resource
+
+  .card
+    .card-body
+      - datatable = EffectiveResources.best('EffectiveRepresentativesDatatable').new(self, organization: resource.organization)
+
+      %h2 Representatives
+      = render_datatable(datatable, inline: true, simple: true)
+
+      %h2 Organization Info
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :id
+
+        = f.fields_for(:organization, f.object.organization) do |fo|
+          = render 'organizations/fields_demographics', f: fo, organization: f.object.organization, parent: resource
+
+        = f.save 'Save and Continue'

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

@@ -4,7 +4,7 @@
   .card
     .card-body
       - if resource.min_applicant_references > 0
-        .alert.alert-danger You must include #{resource.min_applicant_references} or more references.
+        %p You must include #{resource.min_applicant_references} or more references.
 
       = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
         = f.hidden_field :id