effective_memberships 0.3.14 → 0.4.2

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
@@ -41,8 +43,16 @@ EffectiveMemberships::Engine.routes.draw do
     resources :applicant_course_names, except: [:show]
 
     resources :fee_payments, only: [:index, :show]
-    resources :memberships, only: [:index]
+    resources :memberships, only: [:index, :update]
+    resources :membership_histories, except: [:show]
     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.2'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,20 +192,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: effective_organizations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_developer
   requirement: !ruby/object:Gem::Requirement
@@ -261,13 +247,18 @@ files:
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
 - app/controllers/admin/fees_controller.rb
+- app/controllers/admin/membership_histories_controller.rb
 - app/controllers/admin/memberships_controller.rb
+- app/controllers/admin/organizations_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
+- app/controllers/admin/representatives_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
 - app/controllers/effective/fee_payments_controller.rb
 - app/controllers/effective/membership_cards_controller.rb
 - app/controllers/effective/memberships_directory_controller.rb
+- app/controllers/effective/organizations_controller.rb
+- app/controllers/effective/representatives_controller.rb
 - app/datatables/admin/effective_applicant_course_areas_datatable.rb
 - app/datatables/admin/effective_applicant_course_names_datatable.rb
 - app/datatables/admin/effective_applicant_references_datatable.rb
@@ -277,6 +268,8 @@ files:
 - app/datatables/admin/effective_fees_datatable.rb
 - app/datatables/admin/effective_membership_histories_datatable.rb
 - app/datatables/admin/effective_memberships_datatable.rb
+- app/datatables/admin/effective_organizations_datatable.rb
+- app/datatables/admin/effective_representatives_datatable.rb
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb
@@ -284,6 +277,8 @@ files:
 - app/datatables/effective_applicants_datatable.rb
 - app/datatables/effective_fee_payments_datatable.rb
 - app/datatables/effective_memberships_directory_datatable.rb
+- app/datatables/effective_organizations_datatable.rb
+- app/datatables/effective_representatives_datatable.rb
 - app/helpers/effective_memberships_helper.rb
 - app/mailers/effective/memberships_mailer.rb
 - app/models/concerns/effective_memberships_applicant.rb
@@ -291,8 +286,10 @@ files:
 - app/models/concerns/effective_memberships_card.rb
 - app/models/concerns/effective_memberships_category.rb
 - app/models/concerns/effective_memberships_fee_payment.rb
+- app/models/concerns/effective_memberships_organization.rb
 - app/models/concerns/effective_memberships_owner.rb
 - app/models/concerns/effective_memberships_registrar.rb
+- app/models/concerns/effective_memberships_user.rb
 - app/models/effective/applicant.rb
 - app/models/effective/applicant_course.rb
 - app/models/effective/applicant_course_area.rb
@@ -308,8 +305,10 @@ files:
 - app/models/effective/membership_card.rb
 - app/models/effective/membership_category.rb
 - app/models/effective/membership_history.rb
+- app/models/effective/organization.rb
 - app/models/effective/registrar.rb
 - app/models/effective/registrar_action.rb
+- app/models/effective/representative.rb
 - app/views/admin/applicant_course_areas/_form.html.haml
 - app/views/admin/applicant_course_areas/_form_applicant_course_area.html.haml
 - app/views/admin/applicant_course_areas/index.html.haml
@@ -336,7 +335,14 @@ files:
 - app/views/admin/fee_payments/_fee_payment.html.haml
 - app/views/admin/fees/_fee.html.haml
 - app/views/admin/fees/_form.html.haml
+- app/views/admin/membership_histories/_form.html.haml
+- app/views/admin/membership_histories/_validation.html.haml
+- app/views/admin/memberships/_form.html.haml
+- app/views/admin/memberships/_form_membership.html.haml
 - app/views/admin/memberships/_status.html.haml
+- app/views/admin/organizations/_fields.html.haml
+- app/views/admin/organizations/_form.html.haml
+- app/views/admin/organizations/_form_organization.html.haml
 - app/views/admin/registrar_actions/_form.html.haml
 - app/views/admin/registrar_actions/_form_assign.html.haml
 - app/views/admin/registrar_actions/_form_bad_standing.html.haml
@@ -344,6 +350,8 @@ files:
 - app/views/admin/registrar_actions/_form_reclassify.html.haml
 - app/views/admin/registrar_actions/_form_register.html.haml
 - app/views/admin/registrar_actions/_form_remove.html.haml
+- app/views/admin/representatives/_form.html.haml
+- app/views/admin/representatives/_user_fields.html.haml
 - app/views/effective/applicant_references/_applicant_reference.html.haml
 - app/views/effective/applicant_references/_datatable_actions.html.haml
 - app/views/effective/applicant_references/_form.html.haml
@@ -356,16 +364,16 @@ files:
 - app/views/effective/applicants/_dashboard.html.haml
 - app/views/effective/applicants/_declarations.html.haml
 - app/views/effective/applicants/_demographics.html.haml
-- app/views/effective/applicants/_demographics_fields.html.haml
-- app/views/effective/applicants/_demographics_owner.html.haml
 - app/views/effective/applicants/_education.html.haml
 - app/views/effective/applicants/_experience.html.haml
 - app/views/effective/applicants/_files.html.haml
 - app/views/effective/applicants/_layout.html.haml
 - app/views/effective/applicants/_missing_info.html.haml
 - app/views/effective/applicants/_orders.html.haml
+- app/views/effective/applicants/_organization.html.haml
 - app/views/effective/applicants/_references.html.haml
 - app/views/effective/applicants/_select.html.haml
+- app/views/effective/applicants/_select_organization.html.haml
 - app/views/effective/applicants/_stamp.html.haml
 - app/views/effective/applicants/_summary.html.haml
 - app/views/effective/applicants/billing.html.haml
@@ -376,6 +384,7 @@ files:
 - app/views/effective/applicants/education.html.haml
 - app/views/effective/applicants/experience.html.haml
 - app/views/effective/applicants/files.html.haml
+- app/views/effective/applicants/organization.html.haml
 - app/views/effective/applicants/references.html.haml
 - app/views/effective/applicants/select.html.haml
 - app/views/effective/applicants/stamp.html.haml
@@ -386,16 +395,16 @@ files:
 - app/views/effective/fee_payments/_dashboard.html.haml
 - app/views/effective/fee_payments/_declarations.html.haml
 - app/views/effective/fee_payments/_demographics.html.haml
-- app/views/effective/fee_payments/_demographics_fields.html.haml
-- app/views/effective/fee_payments/_demographics_owner.html.haml
 - app/views/effective/fee_payments/_fee_payment.html.haml
 - app/views/effective/fee_payments/_layout.html.haml
 - app/views/effective/fee_payments/_orders.html.haml
+- app/views/effective/fee_payments/_organization.html.haml
 - app/views/effective/fee_payments/_summary.html.haml
 - app/views/effective/fee_payments/billing.html.haml
 - app/views/effective/fee_payments/checkout.html.haml
 - app/views/effective/fee_payments/declarations.html.haml
 - app/views/effective/fee_payments/demographics.html.haml
+- app/views/effective/fee_payments/organization.html.haml
 - app/views/effective/fee_payments/start.html.haml
 - app/views/effective/fee_payments/submitted.html.haml
 - app/views/effective/fee_payments/summary.html.haml
@@ -410,6 +419,15 @@ files:
 - app/views/effective/memberships_mailer/applicant_declined.liquid
 - app/views/effective/memberships_mailer/applicant_missing_info.liquid
 - app/views/effective/memberships_mailer/applicant_reference_notification.liquid
+- app/views/effective/organizations/_dashboard.html.haml
+- app/views/effective/organizations/_form.html.haml
+- app/views/effective/organizations/_form_organization.html.haml
+- app/views/effective/representatives/_form.html.haml
+- app/views/effective/representatives/_user_fields.html.haml
+- app/views/organizations/_demographics.html.haml
+- app/views/organizations/_fields_demographics.html.haml
+- app/views/users/_demographics.html.haml
+- app/views/users/_fields_demographics.html.haml
 - config/effective_memberships.rb
 - config/routes.rb
 - db/migrate/01_create_effective_memberships.rb.erb

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

@@ -1,20 +0,0 @@
-%table.table.table-sm
-  %tbody
-    %tr
-      %th Name
-      %td= owner.to_s
-
-    - if owner.respond_to?(:email) && owner.email.present?
-      %tr
-        %th Email
-        %td= mail_to owner.email
-
-    - if owner.respond_to?(:date_of_birth) && owner.date_of_birth.present?
-      %tr
-        %th Date of Birth
-        %td= owner.date_of_birth.strftime('%F')
-
-    - if owner.respond_to?(:phone) && owner.phone.present?
-      %tr
-        %th Phone:
-        %td= owner.phone

data/app/views/effective/fee_payments/_demographics_owner.html.haml

@@ -1,20 +0,0 @@
-%table.table.table-sm
-  %tbody
-    %tr
-      %th Name
-      %td= owner.to_s
-
-    - if owner.respond_to?(:email) && owner.email.present?
-      %tr
-        %th Email
-        %td= mail_to owner.email
-
-    - if owner.respond_to?(:date_of_birth) && owner.date_of_birth.present?
-      %tr
-        %th Date of Birth
-        %td= owner.date_of_birth.strftime('%F')
-
-    - if owner.respond_to?(:phone) && owner.phone.present?
-      %tr
-        %th Phone:
-        %td= owner.phone