effective_memberships 0.4.17 → 0.5.1

data/app/views/effective/applicants/select/_apply_to_join.html.haml

@@ -0,0 +1 @@
+%p Please select a category for your application to join:

data/app/views/effective/applicants/select/_apply_to_reclassify.html.haml

@@ -0,0 +1,5 @@
+- membership = f.object.owner.membership
+
+%p Apply to reclassify from #{membership.category}.
+
+%p Please select a category for your application to reclassify:

data/app/views/effective/applicants/select/_categories.html.haml

@@ -0,0 +1,25 @@
+- organization_categories = categories.select(&:organization?)
+
+- if categories.blank?
+  %p
+    There are no categories available for you to apply for.
+    Please contact us if you believe this is in error.
+
+- if categories.present?
+  = f.select :category_id, categories, required: true
+
+  - categories.each do |mc|
+    = f.show_if(:category_id, mc.id) do
+      .mb-4
+        %h3= mc.to_s
+
+        - if organization_categories.present?
+          %small.text-muted #{mc.category} #{mc.category_type} Membership
+
+        = mc.rich_text_body
+
+        = render_if_exists("effective/applicants/select/#{mc.to_s.parameterize.underscore}", f: f, category: mc)
+
+- if organization_categories.present?
+  = f.show_if_any(:category_id, organization_categories.map(&:id)) do
+    = render('effective/applicants/select_organization', f: f)

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

@@ -2,41 +2,49 @@
   = render 'effective/applicants/content', resource: resource
 
   - categories = resource.can_apply_categories_collection()
-  - organization_categories = categories.select(&:organization?)
+  - applicant_types = resource.can_apply_applicant_types_collection()
+  - existing_category = resource.owner&.membership&.category
 
   = card do
-    - if categories.blank?
-      %p
-        There are no categories available for you to apply for.
-        Please contact us if you believe this is in error.
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :id
 
-    - if categories.present?
-      %p Please select a category to continue.
+      = f.hidden_field :stream, value: nil
+      = f.hidden_field :organization_id, value: nil
+      = f.hidden_field :organization_type, value: nil
 
-      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-        = f.hidden_field :id
+      = f.hidden_field :applicant_type, value: applicant_types.first
+      = f.hidden_field :category_type, value: EffectiveMemberships.Category.name
 
-        = f.hidden_field :stream, value: nil
-        = f.hidden_field :organization_id, value: nil
-        = f.hidden_field :organization_type, value: nil
-        = f.hidden_field :category_type, value: EffectiveMemberships.Category.name
+      - if applicant_types == ['Apply to Join']
+        = render('effective/applicants/select/apply_to_join', f: f)
+        = render('effective/applicants/select/categories', f: f, categories: categories)
 
-        = f.select :category_id, categories, required: true
+      - elsif applicant_types == ['Apply for Reinstatement']
+        = f.hidden_field :applicant_type, value: applicant_types.first
+        = f.hidden_field :category_id, value: existing_category.id
+        = render('effective/applicants/select/apply_for_reinstatement', f: f)
 
-        - categories.each do |mc|
-          = f.show_if(:category_id, mc.id) do
-            .mb-4
-              %h3= mc.to_s
+      - elsif applicant_types == ['Apply to Reclassify']
+        = render('effective/applicants/select/apply_to_reclassify', f: f)
+        = render('effective/applicants/select/categories', f: f, categories: categories - [existing_category])
 
-              - if organization_categories.present?
-                %small.text-muted #{mc.category} #{mc.category_type} Membership
+      - else
+        = f.select :applicant_type, applicant_types, label: 'Apply to...'
 
-              = mc.rich_text_body
+        - if applicant_types.include?('Apply to Join')
+          = f.show_if :applicant_type, 'Apply to Join' do
+            = render('effective/applicants/select/apply_to_join', f: f)
+            = render('effective/applicants/select/categories', f: f, categories: categories)
 
-              = render_if_exists("effective/applicants/select/#{mc.to_s.parameterize.underscore}", f: f, category: mc)
+        - if applicant_types.include?('Apply to Reclassify')
+          = f.show_if :applicant_type, 'Apply to Reclassify' do
+            = render('effective/applicants/select/apply_to_reclassify', f: f)
+            = render('effective/applicants/select/categories', f: f, categories: categories - [existing_category])
 
-        - if organization_categories.present?
-          = f.show_if_any(:category_id, organization_categories.map(&:id)) do
-            = render('effective/applicants/select_organization', f: f)
+        - if applicant_types.include?('Apply for Reinstatement')
+          = f.show_if :applicant_type, 'Apply for Reinstatement' do
+            = f.hidden_field :category_id, value: existing_category.id
+            = render('effective/applicants/select/apply_for_reinstatement', f: f)
 
-        = f.save 'Save and Continue'
+      = f.save 'Save and Continue'

data/config/effective_memberships.rb

@@ -5,6 +5,7 @@ EffectiveMemberships.setup do |config|
   config.fee_payments_table_name = :fee_payments
   config.organizations_table_name = :organizations
   config.representatives_table_name = :representatives
+  config.statuses_table_name = :statuses
 
   # Layout Settings
   # Configure the Layout per controller, or all at once
@@ -17,8 +18,11 @@ EffectiveMemberships.setup do |config|
   # config.category_class_name = 'Effective::Category'
   # config.applicant_class_name = 'Effective::Applicant'
   # config.applicant_review_class_name = 'Effective::ApplicantReview'
+  # config.fee_payment_class_name = 'Effective::FeePayment'
+  # config.membership_card_class_name = 'Effective::MembershipCard'
   # config.registrar_class_name = 'Effective::Registrar'
   # config.organization_class_name = 'Effective::Organization'
+  # config.status_class_name = 'Effective::Status'
 
   # Fee Categories
   # The defaults include: Applicant, Prorated, Renewal, Late, Admin

data/config/routes.rb

@@ -46,7 +46,7 @@ EffectiveMemberships::Engine.routes.draw do
     end
 
     resources :fees
-    resources :categories, except: [:show]
+    resources :categories, only: [:index, :edit, :update]
 
     resources :applicant_course_areas, except: [:show]
     resources :applicant_course_names, except: [:show]
@@ -62,6 +62,7 @@ EffectiveMemberships::Engine.routes.draw do
     end
 
     resources :representatives, except: [:show]
+    resources :statuses, only: [:index, :edit, :update]
   end
 
 end

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

@@ -18,6 +18,7 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
 
       t.text :applicant_wizard_steps
       t.integer :applicant_fee
+      t.integer :applicant_reinstatement_fee
 
       t.text :applicant_review_wizard_steps
 
@@ -65,6 +66,22 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :categories, :title
     add_index :categories, :position
 
+    # Statuses
+    create_table :statuses do |t|
+      t.string :status_type         # Individual or Organization
+
+      t.string :title
+      t.string :status              # Freeform
+
+      t.integer :position
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :statuses, :title
+    add_index :statuses, :position
+
     # Memberships
     create_table :memberships do |t|
       t.integer :owner_id
@@ -98,6 +115,15 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.string :membership_type
     end
 
+    # Membership Statuses Join table
+    create_table :membership_statuses do |t|
+      t.integer :status_id
+      t.string :status_type
+
+      t.integer :membership_id
+      t.string :membership_type
+    end
+
     # Membership Histories
     create_table :membership_histories do |t|
       t.integer :owner_id
@@ -106,6 +132,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.text :categories
       t.text :category_ids
 
+      t.text :statuses
+      t.text :status_ids
+
       t.date :start_on
       t.date :end_on
 
@@ -182,6 +211,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :from_category_id
       t.string :from_category_type
 
+      t.integer :from_status_id
+      t.string :from_status_type
+
       # Acts as Statused
       t.string :status
       t.text :status_steps
@@ -427,6 +459,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :category_id
       t.string :category_type
 
+      t.integer :with_status_id
+      t.string :with_status_type
+
       t.string :fee_type
 
       t.integer :purchased_order_id
@@ -471,6 +506,9 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       t.integer :category_id
       t.string :category_type
 
+      t.integer :with_status_id
+      t.string :with_status_type
+
       t.date :period
 
       # Acts as Statused

data/db/seeds.rb

@@ -9,6 +9,8 @@ if Rails.env.test?
   Effective::ApplicantCourseName.delete_all
 end
 
+Effective::Status.where(title: 'Resigned').first_or_create!
+
 member = Effective::Category.create!(
   title: "Full Member",
   can_apply_new: true,
@@ -18,6 +20,7 @@ member = Effective::Category.create!(
   min_applicant_references: 2,
   min_applicant_reviews: 2,
   applicant_fee: 100_00,
+  applicant_reinstatement_fee: 50_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,
@@ -34,6 +37,7 @@ student = Effective::Category.create!(
   min_applicant_references: 0,
   min_applicant_reviews: 0,
   applicant_fee: 50_00,
+  applicant_reinstatement_fee: 25_00,
   renewal_fee: 125_00,
   late_fee: 25_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,
@@ -49,6 +53,7 @@ retired = Effective::Category.create!(
   can_apply_restricted: true,
   can_apply_restricted_ids: [member.id],
   applicant_fee: 0,
+  applicant_reinstatement_fee: 0,
   renewal_fee: 0,
   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,
@@ -66,6 +71,7 @@ member = Effective::Category.create!(
   min_applicant_references: 2,
   min_applicant_reviews: 2,
   applicant_fee: 100_00,
+  applicant_reinstatement_fee: 50_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,

data/lib/effective_memberships/engine.rb

@@ -12,6 +12,7 @@ module EffectiveMemberships
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(EffectiveMembershipsOwner::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsCategory::Base)
+        ActiveRecord::Base.extend(EffectiveMembershipsStatus::Base)
 
         ActiveRecord::Base.extend(EffectiveMembershipsUser::Base)
         ActiveRecord::Base.extend(EffectiveMembershipsOrganization::Base)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.4.17'
+  VERSION = '0.5.1'
 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, :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,
+      :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name, :statuses_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, :status_class_name,
       :additional_fee_types, :applicant_reviews, :applicant_endorsements_endorser_collection,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
@@ -40,14 +40,13 @@ module EffectiveMemberships
     membership_card_class_name&.constantize || Effective::MembershipCard
   end
 
-  def self.applicant_reviews?
-    applicant_reviews == true
+  def self.Status
+    status_class_name&.constantize || Effective::Status
   end
 
   # Singleton
   def self.Registrar
-    klass = registrar_class_name&.constantize || Effective::Registrar
-    klass.new
+    (registrar_class_name&.constantize || Effective::Registrar).new
   end
 
   def self.mailer_class
@@ -55,7 +54,7 @@ module EffectiveMemberships
   end
 
   def self.fee_types
-    required = ['Applicant', 'Prorated', 'Discount', 'Renewal', 'Late', 'Admin']
+    required = ['Applicant', 'Reinstatement', 'Prorated', 'Discount', 'Renewal', 'Late', 'Admin']
     additional = Array(additional_fee_types)
 
     (required + additional).uniq.sort
@@ -66,4 +65,8 @@ module EffectiveMemberships
     ['Admin']
   end
 
+  def self.applicant_reviews?
+    applicant_reviews == true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,7 @@ files:
 - app/controllers/admin/organizations_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
 - app/controllers/admin/representatives_controller.rb
+- app/controllers/admin/statuses_controller.rb
 - app/controllers/effective/applicant_endorsements_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
@@ -287,6 +288,7 @@ files:
 - app/datatables/admin/effective_memberships_datatable.rb
 - app/datatables/admin/effective_organizations_datatable.rb
 - app/datatables/admin/effective_representatives_datatable.rb
+- app/datatables/admin/effective_statuses_datatable.rb
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_endorsements_datatable.rb
@@ -308,6 +310,7 @@ files:
 - 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_status.rb
 - app/models/concerns/effective_memberships_user.rb
 - app/models/effective/applicant.rb
 - app/models/effective/applicant_course.rb
@@ -326,10 +329,12 @@ files:
 - app/models/effective/membership_card.rb
 - app/models/effective/membership_category.rb
 - app/models/effective/membership_history.rb
+- app/models/effective/membership_status.rb
 - app/models/effective/organization.rb
 - app/models/effective/registrar.rb
 - app/models/effective/registrar_action.rb
 - app/models/effective/representative.rb
+- app/models/effective/status.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
@@ -374,8 +379,11 @@ 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/registrar_actions/_form_status_change.html.haml
 - app/views/admin/representatives/_form.html.haml
 - app/views/admin/representatives/_user_fields.html.haml
+- app/views/admin/statuses/_form.html.haml
+- app/views/admin/statuses/_form_status.html.haml
 - app/views/admin/users/_col.html.haml
 - app/views/effective/applicant_endorsements/_applicant_endorsement.html.haml
 - app/views/effective/applicant_endorsements/_datatable_actions.html.haml
@@ -405,6 +413,7 @@ files:
 - 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/_reinstatement.html.haml
 - app/views/effective/applicants/_select.html.haml
 - app/views/effective/applicants/_select_organization.html.haml
 - app/views/effective/applicants/_stamp.html.haml
@@ -423,7 +432,12 @@ files:
 - 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/reinstatement.html.haml
 - app/views/effective/applicants/select.html.haml
+- app/views/effective/applicants/select/_apply_for_reinstatement.html.haml
+- app/views/effective/applicants/select/_apply_to_join.html.haml
+- app/views/effective/applicants/select/_apply_to_reclassify.html.haml
+- app/views/effective/applicants/select/_categories.html.haml
 - app/views/effective/applicants/stamp.html.haml
 - app/views/effective/applicants/start.html.haml
 - app/views/effective/applicants/submitted.html.haml