effective_memberships 0.3.14 → 0.4.0

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

@@ -1,20 +1,32 @@
 %h2 Fees
-- current_owner = current_user.effective_memberships_owner
 
-- fees = current_owner.outstanding_fee_payment_fees
-- membership = current_owner.membership
+- memberships = current_user.memberships
+- outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
 
-- if membership.present?
-  - if membership.category.create_renewal_fees?
+- if memberships.present?
+  - if memberships.any? { |membership| membership.category.create_renewal_fees? }
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
     %p Annual fees become available for purchase on #{date.strftime('%B %e')} of each year.
 
-  - if membership.category.create_late_fees?
+  - if memberships.any? { |membership| membership.category.create_late_fees? }
     - date = EffectiveMemberships.Registrar.late_fee_date(date: Time.zone.now)
     %p Late fees will be applied on #{date.strftime('%B %e')}.
 
-- if fees.present?
-  .alert.alert-warning.mb-3 You have #{pluralize(fees.length , 'outstanding fee')}.
+  - if memberships.any? { |membership| membership.category.create_bad_standing? }
+    - date = EffectiveMemberships.Registrar.bad_standing_date(date: Time.zone.now)
+    %p Memberships with unpaid fees will be marked in bad standing on #{date.strftime('%B %e')}.
+
+- if outstanding_owners.present?
+  .alert.alert-warning.mb-3 You have outstanding fees ready to purchase.
+
+  %ul
+    - outstanding_owners.each do |owner|
+      %li
+        = owner
+
+        - if owner.outstanding_fee_payment_fees.present?
+          = '-'
+          = pluralize(owner.outstanding_fee_payment_fees.length, 'outstanding fee')
 
   %p= link_to 'Pay Fees', effective_memberships.new_fee_payment_path, class: 'btn btn-primary'
 

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

@@ -1,8 +1,9 @@
-- current_owner = current_user.effective_memberships_owner
-- membership = current_owner.membership
+- membership = current_user.membership
+- membership_organizations = current_user.membership_organizations
 
 %h2 Membership
 
+-# Individual membership
 - if membership.present?
   - if membership.categories.length == 0
     %p
@@ -29,8 +30,18 @@
   - if membership.bad_standing?
     %p Your membership is in bad standing with the following reason: #{membership.bad_standing_reason}.
 
-- elsif current_owner.membership_removed?
-  %p Your membership was removed on #{current_owner.membership_removed_on.strftime('%F')}.
+- if current_user.membership_removed?
+  %p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.
 
-- else
+- if membership_organizations.present?
+  %p You are a representative for #{pluralize(membership_organizations.length, 'member organization')}.
+
+  %ul
+    - membership_organizations.each do |organization|
+      %li
+        = organization
+        = '-'
+        = organization.membership.categories.to_sentence
+
+- if current_user.is?(:member) == false
   %p You are not a member.

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

@@ -0,0 +1,10 @@
+%h2 Organizations
+
+- if current_user.organizations.present?
+  %p You are a representative for #{pluralize(current_user.organizations.length, 'organization')}.
+
+  - datatable = EffectiveResources.best('EffectiveOrganizationsDatatable').new(self, namespace: :effective)
+  = render_datatable(datatable, simple: true)
+
+- else
+  %p You are not a representative. When you create an organization, or if someone else adds you to their organization, we'll show them here.

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

@@ -0,0 +1,8 @@
+= tabs do
+  = tab 'Organization' do
+    = render 'effective/organizations/form_organization', organization: organization
+
+  - if organization.persisted?
+    - if organization.respond_to?(:log_changes_datatable)
+      = tab 'Logs' do
+        = render_inline_datatable(organization.log_changes_datatable)

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

@@ -0,0 +1,11 @@
+- url = (organization.persisted? ? effective_memberships.organization_path(organization) : effective_memberships.organizations_path)
+
+= effective_form_with(model: organization, url: url) do |f|
+  %h2 Organization Info
+  = render 'organizations/fields_demographics', f: f, organization: organization
+  = f.submit
+
+- if organization.persisted?
+  %h2 Representatives
+  - datatable = EffectiveRepresentativesDatatable.new(organization: organization)
+  = render_inline_datatable(datatable)

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

@@ -0,0 +1,33 @@
+= effective_form_with(model: 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.hidden_field :new_representative_user_action, value: 'Invite new user'
+
+      = f.fields_for :user, (f.object.user || f.object.build_user) do |fu|
+        = render 'effective/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)
+
+    = f.fields_for :user, f.object.user do |fu|
+      = render 'effective/representatives/user_fields', f: fu
+
+  = f.submit

data/app/views/effective/{fee_payments/_demographics_fields.html.haml → 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/organizations/_demographics.html.haml

@@ -0,0 +1,45 @@
+-# This is a placeholder file that should be overriden by the main application
+
+%table.table.table-sm
+  %tbody
+    %tr
+      %th Name
+      %td= organization.to_s
+
+    %tr
+      %th Email
+      %td= mail_to organization.email
+
+    - if organization.respond_to?(:website)
+      %tr
+        %th Website:
+        %td= organization.website.presence || '-'
+
+    - if organization.respond_to?(:phone)
+      %tr
+        %th Phone:
+        %td= organization.phone.presence || '-'
+
+    - if organization.respond_to?(:company_phone)
+      %tr
+        %th Company Phone:
+        %td= organization.company_phone.presence || '-'
+
+    - if organization.respond_to?(:cell_phone)
+      %tr
+        %th Cell Phone:
+        %td= organization.cell_phone.presence || '-'
+
+    - if organization.respond_to?(:fax)
+      %tr
+        %th Fax:
+        %td= organization.fax.presence || '-'
+
+    - if organization.respond_to?(:billing_address)
+      %tr
+        %th Billing Address:
+        %td
+          - if organization.billing_address.present?
+            = organization.billing_address.to_html
+          - else
+            = '-'

data/app/views/organizations/_fields_demographics.html.haml

@@ -0,0 +1,29 @@
+-# This is a placeholder file that should be overriden by the main application
+
+- if f.object.respond_to?(:title)
+  = f.text_field :title
+
+- if f.object.respond_to?(:name)
+  = f.text_field :name
+
+- if f.object.respond_to?(:email)
+  = f.email_field :email
+
+- if f.object.respond_to?(:website)
+  = f.url_field :website
+
+- if f.object.respond_to?(:phone)
+  = f.tel_field :phone
+
+- if f.object.respond_to?(:company_phone)
+  = f.tel_field :company_phone
+
+- if f.object.respond_to?(:cell_phone)
+  = f.tel_field :cell_phone
+
+- if f.object.respond_to?(:fax)
+  = f.tel_field :fax
+
+- if f.object.respond_to?(:billing_address)
+  %h2 Billing Address
+  = effective_address_fields(f, :billing_address)

data/app/views/users/_demographics.html.haml

@@ -0,0 +1,50 @@
+-# This is a placeholder file that should be overriden by the main application
+
+%table.table.table-sm
+  %tbody
+    %tr
+      %th Name
+      %td= user.to_s
+
+    %tr
+      %th Email
+      %td= mail_to user.email
+
+    - if user.respond_to?(:job_title)
+      %tr
+        %th Job Title:
+        %td= user.job_title.presence || '-'
+
+    - if user.respond_to?(:date_of_birth)
+      %tr
+        %th Date of Birth
+        %td= user.date_of_birth&.strftime('%F').presence || '-'
+
+    - if user.respond_to?(:phone)
+      %tr
+        %th Phone:
+        %td= user.phone.presence || '-'
+
+    - if user.respond_to?(:home_phone)
+      %tr
+        %th Home Phone:
+        %td= user.home_phone.presence || '-'
+
+    - if user.respond_to?(:cell_phone)
+      %tr
+        %th Cell Phone:
+        %td= user.cell_phone.presence || '-'
+
+    - if user.respond_to?(:fax)
+      %tr
+        %th Fax:
+        %td= user.fax.presence || '-'
+
+    - if user.respond_to?(:billing_address)
+      %tr
+        %th Billing Address:
+        %td
+          - if user.billing_address.present?
+            = user.billing_address.to_html
+          - else
+            = '-'

data/app/views/users/_fields_demographics.html.haml

@@ -0,0 +1,29 @@
+-# This is a placeholder file that should be overriden by the main application
+
+- 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?(:job_title)
+  = f.text_field :job_title
+
+- if f.object.respond_to?(:date_of_birth)
+  = f.date_field :date_of_birth
+
+- if f.object.respond_to?(:phone)
+  = f.tel_field :phone
+
+- if f.object.respond_to?(:home_phone)
+  = f.tel_field :home_phone
+
+- if f.object.respond_to?(:cell_phone)
+  = f.tel_field :cell_phone
+
+- if f.object.respond_to?(:fax)
+  = f.tel_field :fax
+
+- if f.object.respond_to?(:billing_address)
+  %h2 Billing Address
+  = effective_address_fields(f, :billing_address)

data/config/effective_memberships.rb

@@ -3,6 +3,8 @@ EffectiveMemberships.setup do |config|
   config.applicants_table_name = :applicants
   config.applicant_reviews_table_name = :applicant_reviews
   config.fee_payments_table_name = :fee_payments
+  config.organizations_table_name = :organizations
+  config.representatives_table_name = :representatives
 
   # Layout Settings
   # Configure the Layout per controller, or all at once
@@ -16,6 +18,7 @@ EffectiveMemberships.setup do |config|
   # config.applicant_class_name = 'Effective::Applicant'
   # config.applicant_review_class_name = 'Effective::ApplicantReview'
   # config.registrar_class_name = 'Effective::Registrar'
+  # config.organization_class_name = 'Effective::Organization'
 
   # Fee Categories
   # The defaults include: Applicant, Prorated, Renewal, Late, Admin

data/config/routes.rb

@@ -25,6 +25,8 @@ EffectiveMemberships::Engine.routes.draw do
       get :membership_card, on: :member, to: 'membership_cards#show'
     end
 
+    resources :organizations, except: [:show, :destroy]
+    resources :representatives, except: [:show]
   end
 
   namespace :admin do
@@ -43,6 +45,13 @@ EffectiveMemberships::Engine.routes.draw do
     resources :fee_payments, only: [:index, :show]
     resources :memberships, only: [:index]
     resources :registrar_actions, only: [:create]
+
+    resources :organizations, except: [:show] do
+      post :archive, on: :member
+      post :unarchive, on: :member
+    end
+
+    resources :representatives, except: [:show]
   end
 
 end

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

@@ -3,8 +3,10 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
 
     # Categories
     create_table :categories do |t|
+      t.string :category_type       # Individual or Organization
+
       t.string :title
-      t.string :category
+      t.string :category            # Freeform
 
       t.integer :position
 
@@ -119,12 +121,57 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :membership_histories, [:owner_id, :owner_type]
     add_index :membership_histories, :start_on
 
+    # Organizations
+    create_table :organizations do |t|
+      t.string    :email
+
+      t.string    :title
+
+      t.string    :phone
+      t.string    :fax
+      t.string    :website
+
+      t.string    :category
+      t.text      :notes
+
+      t.integer   :roles_mask
+      t.boolean   :archived, default: false
+
+      t.integer   :representatives_count, default: 0
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :organizations, :title
+
+    # Representatives
+    create_table :representatives do |t|
+      t.integer :organization_id
+      t.string :organization_type
+
+      t.integer :user_id
+      t.string :user_type
+
+      t.integer :roles_mask
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :representatives, [:organization_id, :organization_type]
+    add_index :representatives, [:user_id, :user_type]
+
     # Applicants
     create_table :applicants do |t|
+      t.string :applicant_type
       t.string :token
 
-      t.integer :owner_id
-      t.string :owner_type
+      t.integer :user_id
+      t.string :user_type
+
+      t.integer :organization_id
+      t.string :organization_type
 
       t.integer :category_id
       t.string :category_type
@@ -132,8 +179,6 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :from_category_id
       t.string :from_category_type
 
-      t.string :applicant_type
-
       # Acts as Statused
       t.string :status
       t.text :status_steps
@@ -169,7 +214,8 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :applicants, [:owner_id, :owner_type]
+    add_index :applicants, [:user_id, :user_type]
+    add_index :applicants, [:organization_id, :organization_type]
     add_index :applicants, :status
     add_index :applicants, :token
 
@@ -361,12 +407,12 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     create_table :fee_payments do |t|
       t.string :token
 
-      t.integer :owner_id
-      t.string :owner_type
-
       t.integer :user_id
       t.string :user_type
 
+      t.integer :organization_id
+      t.string :organization_type
+
       t.integer :category_id
       t.string :category_type
 
@@ -386,7 +432,8 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.datetime :created_at
     end
 
-    add_index :fee_payments, [:owner_id, :owner_type]
+    add_index :fee_payments, [:user_id, :user_type]
+    add_index :fee_payments, [:organization_id, :organization_type]
     add_index :fee_payments, :status
     add_index :fee_payments, :token
 

data/db/seeds.rb

@@ -56,6 +56,24 @@ retired = Effective::Category.create!(
   tax_exempt: false
 )
 
+member = Effective::Category.create!(
+  category_type: 'Organization',
+  title: "Corporate",
+  can_apply_new: true,
+  can_apply_existing: true,
+  create_renewal_fees: true,
+  create_late_fees: true,
+  min_applicant_references: 2,
+  min_applicant_reviews: 2,
+  applicant_fee: 100_00,
+  renewal_fee: 250_00,
+  late_fee: 50_00,
+  prorated_jan: 120_00, prorated_feb: 110_00, prorated_mar: 100_00, prorated_apr: 90_00, prorated_may: 80_00, prorated_jun: 70_00,
+  prorated_jul: 60_00, prorated_aug: 50_00, prorated_sep: 40_00, prorated_oct: 30_00, prorated_nov: 20_00, prorated_dec: 10_00,
+  qb_item_name: 'Corporate Member Quickbooks Name',
+  tax_exempt: false
+)
+
 area = Effective::ApplicantCourseArea.create!(title: 'Science')
 area.applicant_course_names.create!(title: 'Science 100')
 area.applicant_course_names.create!(title: 'Science 200')

data/lib/effective_memberships/engine.rb

@@ -13,6 +13,9 @@ module EffectiveMemberships
         ActiveRecord::Base.extend(EffectiveMembershipsOwner::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsCategory::Base)
 
+        ActiveRecord::Base.extend(EffectiveMembershipsUser::Base)
+        ActiveRecord::Base.extend(EffectiveMembershipsOrganization::Base)
+
         ActiveRecord::Base.extend(EffectiveMembershipsApplicant::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsApplicantReview::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsFeePayment::Base)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.3.14'
+  VERSION = '0.4.0'
 end

data/lib/effective_memberships.rb

@@ -6,8 +6,8 @@ module EffectiveMemberships
 
   def self.config_keys
     [
-      :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name,
-      :category_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
+      :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name,
+      :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name,
       :additional_fee_types, :applicant_reviews,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
@@ -20,6 +20,10 @@ module EffectiveMemberships
     category_class_name&.constantize || Effective::Category
   end
 
+  def self.Organization
+    organization_class_name&.constantize || Effective::Organization
+  end
+
   def self.Applicant
     applicant_class_name&.constantize || Effective::Applicant
   end