effective_memberships 0.5.4 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d91995abf15a0631992651d8e6c595d482becfc19500f71dc8d20c28b0ad9a5
-  data.tar.gz: 1e71e351b26dd1ec213e9705c61740ec3c4d0e515b43c19712b523402e80c640
+  metadata.gz: 4b5129f1448e268a4dd8977f9ad66e4d85f6ea9a2430f4ef5ac301a134f273fd
+  data.tar.gz: cc623fb32179f8157d28d80260ab32733fec716afbcdc0b887f76f1106fca241
 SHA512:
-  metadata.gz: 41e68540c92545dea5d8fee849d95ef747d9fb12ef066e0678e664a7e2bd16678a67601abc3ced853e9dba8836cb36eb7e83493854a856922fa6f7a171e4f596
-  data.tar.gz: d2462226813dd2376c9f6a38b2fd84be373716f0c8494ddef239c70616ca829825efca6c52ac7b323c47dffc8bb1e9a4b5428114122616426f7ac9288eda5ef2
+  metadata.gz: 414b1c1c2b7a166fc214d35a62b6b7f5f19cddd6845852dfd0c1bc255720601673eb2607ba1456f1b5c28a92ca3092d92554577855965428e0eb2ffd7cd892b6
+  data.tar.gz: c78a8ebee8e8e56493e89519242ebcec959603f87f877c55683fea709fc29d09c7ac3de5260124e58b1a69021ad6abb0716584826518207ef9722a5a746e98ac

data/app/datatables/admin/effective_categories_datatable.rb

@@ -8,23 +8,40 @@ module Admin
       col :id, visible: false
 
       col :title
-      col :can_apply_new, label: 'Can Apply'
-      col :applicant_fee, as: :price
 
+      col :can_apply_new, label: 'Apply - Anyone', visible: false
+      col :can_apply_existing, label: 'Apply - Current', visible: false
+      col :can_apply_restricted, label: 'Apply - Restricted', visible: false
+
+      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 :late_fee, as: :price, visible: false
+
+      col :prorated_jan, as: :price,  label: 'Jan'
+      col :prorated_feb, as: :price,  label: 'Feb'
+      col :prorated_mar, as: :price,  label: 'Mar'
+      col :prorated_apr, as: :price,  label: 'Apr'
+      col :prorated_may, as: :price,  label: 'May'
+      col :prorated_jun, as: :price,  label: 'Jun'
+      col :prorated_jul, as: :price,  label: 'Jul'
+      col :prorated_aug, as: :price,  label: 'Aug'
+      col :prorated_sep, as: :price,  label: 'Sep'
+      col :prorated_oct, as: :price,  label: 'Oct'
+      col :prorated_nov, as: :price,  label: 'Nov'
+      col :prorated_dec, as: :price,  label: 'Dec'
+
+      col :rich_text_body, label: 'Body', visible: false
+      col :tax_exempt, visible: false
       col :qb_item_name, visible: false
 
       col :create_renewal_fees, visible: false
       col :create_late_fees, visible: false
       col :create_bad_standing, visible: false
 
-      col :category_type, search: EffectiveMemberships.Category.category_types
+      col :category_type, search: EffectiveMemberships.Category.category_types, visible: false
 
-      col :optional_applicant_wizard_steps, label: 'Applicant Steps'
-      col :optional_fee_payment_wizard_steps, label: 'Fee Payment Steps'
+      col :optional_applicant_wizard_steps, label: 'Applicant Steps', visible: false
+      col :optional_fee_payment_wizard_steps, label: 'Fee Payment Steps', visible: false
 
       actions_col
     end

data/app/models/effective/applicant_education.rb

@@ -19,7 +19,6 @@ module Effective
     scope :deep, -> { all }
 
     validates :start_on, presence: true
-    validates :end_on, presence: true
     validates :institution, presence: true
     validates :location, presence: true
     validates :degree_obtained, presence: true

data/app/views/admin/applicants/_form_applicant.html.haml

@@ -49,7 +49,7 @@
 
   - if applicant.owner.applicants.any? { |other| other.was_submitted? && other.id != applicant.id }
     = tab 'Other Applications' do
-      = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner: applicant.owner, except_id: applicant.id))
+      = render_datatable(Admin::EffectiveApplicantsDatatable.new(user: applicant.owner, except_id: applicant.id))
 
   - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
     = tab 'Logs' do

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

@@ -2,13 +2,30 @@
   = tab 'Category' do
     = render 'admin/categories/form_category', category: category
 
+    - if category.persisted?
+      = render 'admin/categories/form_applicant_eligibility', category: category
+
+      = render 'admin/categories/form_applicant_fees', category: category
+      = render 'admin/categories/form_renewals', category: category
+
+
   - if category.persisted?
-    = tab 'Applicants' do
-      = render 'admin/categories/form_applicant', category: category
+    = tab 'Content - Applicants' do
+      = render 'admin/categories/form_applicant_content', category: category
+
+    = tab 'Content - Renewals' do
+      = render 'admin/categories/form_fee_payment_content', category: category
 
-    = tab 'Fee Payments' do
-      = render 'admin/categories/form_fee_payment', category: category
+    = tab 'Wizards' do
+      .row
+        .col
+          = render 'admin/categories/form_applicant_steps', category: category
+
+        .col
+          = render 'admin/categories/form_fee_payment_steps', category: category
 
     - if category.respond_to?(:log_changes_datatable)
       = tab 'Logs' do
         = render_inline_datatable(category.log_changes_datatable)
+
+

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

@@ -1,19 +1,18 @@
-%p Each of the following content areas will be displayed on the applicant wizard.
-
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   = card("All Steps") do
-    = f.rich_text_area "rich_text_applicant_all_steps_content", label: false,
-      hint: "displayed on all steps"
-
-  %hr
-
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
   - enabled = f.object.applicant_wizard_steps
 
   - EffectiveMemberships.Applicant::WIZARD_STEPS.each do |step, title|
     - next unless enabled.include?(step)
 
     = card("#{title}") do
-      = f.rich_text_area "rich_text_applicant_#{step}_content", label: false,
-        hint: "displayed on the applicant #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_applicant_#{step}_content", label: false, hint: "displayed on the applicant #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_applicant_#{step}_content", label: false, hint: "displayed on the applicant #{step} wizard step only"
 
   = f.submit

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

@@ -1,13 +1,9 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Eligibility
-  %p Please configure who may apply for this membership category.
-
-  = 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'
+  %h3 Applicant Eligibility
+  = f.check_box :can_apply_new, label: 'Anyone may apply for this category'
+  = f.check_box :can_apply_existing, label: 'Any current member may apply to join'
+  = f.check_box :can_apply_restricted, label: 'Only some current members may apply to join'
 
   = f.show_if(:can_apply_restricted, true) do
     - categories = f.object.class.where.not(id: f.object)
     = f.select :can_apply_restricted_ids, categories, label: 'Existing member categories'
-
-  = f.submit

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

@@ -1,16 +1,10 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Fees
-
-  %p Charged to submit an application to join this membership category:
-
-  .row
-    .col-lg-3= f.price_field :applicant_fee
-
+  %h3 Applicant Fees
   .row
-    .col-lg-3= f.text_field :qb_item_name, label: "Quickbooks Item Name"
-
-  %p Charged to join, based on the month of approval:
+    .col= f.price_field :applicant_fee
+    .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
 
+  %h3 Pro-rated fees based on date of approval
   .row
     .col-lg-3
       = f.price_field :prorated_jan, label: "January"
@@ -28,5 +22,3 @@
       = f.price_field :prorated_oct, label: "October"
       = f.price_field :prorated_nov, label: "November"
       = f.price_field :prorated_dec, label: "December"
-
-  = f.submit

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

@@ -1,14 +1,10 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Wizard Steps
-
-  %p The following steps will be required when applying for this membership category.
-
+  %h3 Applicant Wizard Steps
   - f.object.applicant_wizard_steps += EffectiveMemberships.Applicant.required_wizard_steps
-  = f.checks :applicant_wizard_steps, f.object.applicant_wizard_steps_collection()
-
-  %h3 Requirements
+  = f.checks :applicant_wizard_steps, f.object.applicant_wizard_steps_collection(), label: false
 
-  %p The following numbers set the minimum number of required items an applicant must provide to complete the step. Leave blank for none.
+  %h3 Applicant Requirements
+  %p The following numbers set the minimum number of required items an applicant must provide to complete each step. Leave blank for none.
 
   - applicant = EffectiveMemberships.Applicant.new
 

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

@@ -1,13 +1,17 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  = f.text_field :title
+  .row
+    .col= f.text_field :title, label: 'Category title'
 
-  = f.select :category_type, f.object.class.category_types,
-    hint: 'When Organization, the organization will be given membership. Otherwise the individual user'
+    .col
+      = f.select :category_type, f.object.class.category_types,
+        hint: 'When Individual, the membership belongs to a person. When Organization, the organization will be given membership and the representatives will inherit their status.'
 
-  - if f.object.class.categories.present?
-    = f.select :category, f.object.class.categories
+      - if f.object.class.categories.present?
+        = f.select :category, f.object.class.categories
 
-  = f.rich_text_area :rich_text_body, label: 'Body',
-    hint: 'A quick description of this category. It is displayed on the Application Select Category step.'
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_body, label: 'Description shown in the Application to Join wizard'
+  - else
+    = f.rich_text_area :rich_text_body, label: 'Description shown in the Application to Join wizard'
 
   = f.submit

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

@@ -1,11 +1,9 @@
-%p Each of the following content areas will be displayed on the fee payment wizard.
-
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   = card("All Steps") do
-    = f.rich_text_area "rich_text_fee_payment_all_steps_content", label: false,
-      hint: "displayed on all steps"
-
-  %hr
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_fee_payment_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_fee_payment_all_steps_content", label: false, hint: "displayed on all steps"
 
   - enabled = f.object.fee_payment_wizard_steps
 
@@ -13,7 +11,9 @@
     - next unless enabled.include?(step)
 
     = card("#{title}") do
-      = f.rich_text_area "rich_text_fee_payment_#{step}_content", label: false,
-        hint: "displayed on the fee payment #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_fee_payment_#{step}_content", label: false, hint: "displayed on the fee payment #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_fee_payment_#{step}_content", label: false, hint: "displayed on the fee payment #{step} wizard step only"
 
   = f.submit

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

@@ -1,9 +1,6 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
-  %h3 Wizard Steps
-
-  %p The following steps will be required when purchasing fees for this membership category.
-
+  %h3 Renewal Wizard Steps
   - f.object.fee_payment_wizard_steps += EffectiveMemberships.FeePayment.required_wizard_steps
-  = f.checks :fee_payment_wizard_steps, f.object.fee_payment_wizard_steps_collection()
+  = f.checks :fee_payment_wizard_steps, f.object.fee_payment_wizard_steps_collection(), label: false
 
   = f.submit

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

@@ -1,6 +1,6 @@
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   %h3 Renewal Fees
-  = f.check_box :create_renewal_fees, label: 'Yes, renewal fees should be created'
+  = f.check_box :create_renewal_fees, label: 'Yes, annual renewal fees should be created'
 
   = f.show_if(:create_renewal_fees, true) do
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)

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

@@ -11,7 +11,7 @@
       = f.has_many(:applicant_educations, cards: true) do |aef|
         %h4.mb-4 Post-Secondary Education
 
-        = aef.text_field :degree_obtained, label: 'Degree, diploma or program'
+        = aef.text_field :degree_obtained, label: 'Degree, diploma, or program'
 
         .row
           .col= aef.text_field :institution
@@ -19,7 +19,7 @@
 
         .row
           .col= aef.date_field :start_on, label: 'Start Date'
-          .col= aef.date_field :end_on, label: 'End Date'
+          .col= aef.date_field :end_on, label: 'Graduation Date'
 
       = render_if_exists("effective/applicants/education_fields", f: f)
 

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

@@ -40,6 +40,15 @@
         %th Fax:
         %td= user.fax.presence || '-'
 
+    - if user.respond_to?(:residential_address)
+      %tr
+        %th Residential Address:
+        %td
+          - if user.residential_address.present?
+            = user.residential_address.to_html
+          - else
+            = '-'
+
     - if user.respond_to?(:billing_address)
       %tr
         %th Billing Address:

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.5.4'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -352,13 +352,11 @@ files:
 - app/views/admin/applicants/_form_transcripts.html.haml
 - app/views/admin/applicants/_status.html.haml
 - app/views/admin/categories/_form.html.haml
-- app/views/admin/categories/_form_applicant.html.haml
 - app/views/admin/categories/_form_applicant_content.html.haml
 - app/views/admin/categories/_form_applicant_eligibility.html.haml
 - app/views/admin/categories/_form_applicant_fees.html.haml
 - app/views/admin/categories/_form_applicant_steps.html.haml
 - app/views/admin/categories/_form_category.html.haml
-- app/views/admin/categories/_form_fee_payment.html.haml
 - app/views/admin/categories/_form_fee_payment_content.html.haml
 - app/views/admin/categories/_form_fee_payment_steps.html.haml
 - app/views/admin/categories/_form_renewals.html.haml

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

@@ -1,12 +0,0 @@
-= tabs do
-  = tab 'Eligibility' do
-    = render 'admin/categories/form_applicant_eligibility', category: category
-
-  = tab 'Fees' do
-    = render 'admin/categories/form_applicant_fees', category: category
-
-  = tab 'Applicant Steps' do
-    = render 'admin/categories/form_applicant_steps', category: category
-
-  = tab 'Applicant Content' do
-    = render 'admin/categories/form_applicant_content', category: category

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

@@ -1,9 +0,0 @@
-= tabs do
-  = tab 'Renewals' do
-    = render 'admin/categories/form_renewals', category: category
-
-  = tab 'Fee Payment Steps' do
-    = render 'admin/categories/form_fee_payment_steps', category: category
-
-  = tab 'Fee Payment Content' do
-    = render 'admin/categories/form_fee_payment_content', category: category