effective_memberships 0.6.1 → 0.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a428993d4ea724f2546ead08c6ab020c53617c6fe114485d1e89e9b3b5d4c409
4
- data.tar.gz: 77b8313894bb1268432300a90eae98841914f3b17089e4cac16247912f1fed0c
3
+ metadata.gz: 4b5129f1448e268a4dd8977f9ad66e4d85f6ea9a2430f4ef5ac301a134f273fd
4
+ data.tar.gz: cc623fb32179f8157d28d80260ab32733fec716afbcdc0b887f76f1106fca241
5
5
  SHA512:
6
- metadata.gz: 7978b946748cdd65f80838021267f79753496dc008d576055d7cd7f2a1fce2dd27da68215751780fb6c48e5e1617ef12a47e151f7fcc4b5e7a822c561c15b90a
7
- data.tar.gz: 38a4a28c95f01b5d061d46bba148d3b6c96e7701de0979e1229907e0f518dd1a35689812bb3521e6acdf0432647bd459fc2c065b9678019f206807f6a6e3b836
6
+ metadata.gz: 414b1c1c2b7a166fc214d35a62b6b7f5f19cddd6845852dfd0c1bc255720601673eb2607ba1456f1b5c28a92ca3092d92554577855965428e0eb2ffd7cd892b6
7
+ data.tar.gz: c78a8ebee8e8e56493e89519242ebcec959603f87f877c55683fea709fc29d09c7ac3de5260124e58b1a69021ad6abb0716584826518207ef9722a5a746e98ac
@@ -8,23 +8,40 @@ module Admin
8
8
  col :id, visible: false
9
9
 
10
10
  col :title
11
- col :can_apply_new, label: 'Can Apply'
12
- col :applicant_fee, as: :price
13
11
 
12
+ col :can_apply_new, label: 'Apply - Anyone', visible: false
13
+ col :can_apply_existing, label: 'Apply - Current', visible: false
14
+ col :can_apply_restricted, label: 'Apply - Restricted', visible: false
15
+
16
+ col :applicant_fee, as: :price
14
17
  col :renewal_fee, as: :price
15
- col :late_fee, as: :price
16
- col :rich_text_body, label: 'Body'
17
- col :tax_exempt
18
+ col :late_fee, as: :price, visible: false
19
+
20
+ col :prorated_jan, as: :price, label: 'Jan'
21
+ col :prorated_feb, as: :price, label: 'Feb'
22
+ col :prorated_mar, as: :price, label: 'Mar'
23
+ col :prorated_apr, as: :price, label: 'Apr'
24
+ col :prorated_may, as: :price, label: 'May'
25
+ col :prorated_jun, as: :price, label: 'Jun'
26
+ col :prorated_jul, as: :price, label: 'Jul'
27
+ col :prorated_aug, as: :price, label: 'Aug'
28
+ col :prorated_sep, as: :price, label: 'Sep'
29
+ col :prorated_oct, as: :price, label: 'Oct'
30
+ col :prorated_nov, as: :price, label: 'Nov'
31
+ col :prorated_dec, as: :price, label: 'Dec'
32
+
33
+ col :rich_text_body, label: 'Body', visible: false
34
+ col :tax_exempt, visible: false
18
35
  col :qb_item_name, visible: false
19
36
 
20
37
  col :create_renewal_fees, visible: false
21
38
  col :create_late_fees, visible: false
22
39
  col :create_bad_standing, visible: false
23
40
 
24
- col :category_type, search: EffectiveMemberships.Category.category_types
41
+ col :category_type, search: EffectiveMemberships.Category.category_types, visible: false
25
42
 
26
- col :optional_applicant_wizard_steps, label: 'Applicant Steps'
27
- col :optional_fee_payment_wizard_steps, label: 'Fee Payment Steps'
43
+ col :optional_applicant_wizard_steps, label: 'Applicant Steps', visible: false
44
+ col :optional_fee_payment_wizard_steps, label: 'Fee Payment Steps', visible: false
28
45
 
29
46
  actions_col
30
47
  end
@@ -49,7 +49,7 @@
49
49
 
50
50
  - if applicant.owner.applicants.any? { |other| other.was_submitted? && other.id != applicant.id }
51
51
  = tab 'Other Applications' do
52
- = render_datatable(Admin::EffectiveApplicantsDatatable.new(owner: applicant.owner, except_id: applicant.id))
52
+ = render_datatable(Admin::EffectiveApplicantsDatatable.new(user: applicant.owner, except_id: applicant.id))
53
53
 
54
54
  - if applicant.persisted? && applicant.respond_to?(:log_changes_datatable)
55
55
  = tab 'Logs' do
@@ -2,13 +2,30 @@
2
2
  = tab 'Category' do
3
3
  = render 'admin/categories/form_category', category: category
4
4
 
5
+ - if category.persisted?
6
+ = render 'admin/categories/form_applicant_eligibility', category: category
7
+
8
+ = render 'admin/categories/form_applicant_fees', category: category
9
+ = render 'admin/categories/form_renewals', category: category
10
+
11
+
5
12
  - if category.persisted?
6
- = tab 'Applicants' do
7
- = render 'admin/categories/form_applicant', category: category
13
+ = tab 'Content - Applicants' do
14
+ = render 'admin/categories/form_applicant_content', category: category
15
+
16
+ = tab 'Content - Renewals' do
17
+ = render 'admin/categories/form_fee_payment_content', category: category
8
18
 
9
- = tab 'Fee Payments' do
10
- = render 'admin/categories/form_fee_payment', category: category
19
+ = tab 'Wizards' do
20
+ .row
21
+ .col
22
+ = render 'admin/categories/form_applicant_steps', category: category
23
+
24
+ .col
25
+ = render 'admin/categories/form_fee_payment_steps', category: category
11
26
 
12
27
  - if category.respond_to?(:log_changes_datatable)
13
28
  = tab 'Logs' do
14
29
  = render_inline_datatable(category.log_changes_datatable)
30
+
31
+
@@ -1,14 +1,9 @@
1
- %p Each of the following content areas will be displayed on the applicant wizard.
2
-
3
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
4
2
  = card("All Steps") do
5
3
  - if defined?(EffectiveArticleEditor)
6
4
  = f.article_editor "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
7
5
  - else
8
6
  = f.rich_text_area "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
9
-
10
- %hr
11
-
12
7
  - enabled = f.object.applicant_wizard_steps
13
8
 
14
9
  - EffectiveMemberships.Applicant::WIZARD_STEPS.each do |step, title|
@@ -1,13 +1,9 @@
1
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
2
- %h3 Eligibility
3
- %p Please configure who may apply for this membership category.
4
-
5
- = f.check_box :can_apply_new, label: 'Yes, new applicants may apply to join'
6
- = f.check_box :can_apply_existing, label: 'Yes, existing members of any category may apply to join'
7
- = f.check_box :can_apply_restricted, label: 'Only existing members of the following categories may apply to join'
2
+ %h3 Applicant Eligibility
3
+ = f.check_box :can_apply_new, label: 'Anyone may apply for this category'
4
+ = f.check_box :can_apply_existing, label: 'Any current member may apply to join'
5
+ = f.check_box :can_apply_restricted, label: 'Only some current members may apply to join'
8
6
 
9
7
  = f.show_if(:can_apply_restricted, true) do
10
8
  - categories = f.object.class.where.not(id: f.object)
11
9
  = f.select :can_apply_restricted_ids, categories, label: 'Existing member categories'
12
-
13
- = f.submit
@@ -1,16 +1,10 @@
1
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
2
- %h3 Fees
3
-
4
- %p Charged to submit an application to join this membership category:
5
-
6
- .row
7
- .col-lg-3= f.price_field :applicant_fee
8
-
2
+ %h3 Applicant Fees
9
3
  .row
10
- .col-lg-3= f.text_field :qb_item_name, label: "Quickbooks Item Name"
11
-
12
- %p Charged to join, based on the month of approval:
4
+ .col= f.price_field :applicant_fee
5
+ .col= f.text_field :qb_item_name, label: "Quickbooks Item Name"
13
6
 
7
+ %h3 Pro-rated fees based on date of approval
14
8
  .row
15
9
  .col-lg-3
16
10
  = f.price_field :prorated_jan, label: "January"
@@ -28,5 +22,3 @@
28
22
  = f.price_field :prorated_oct, label: "October"
29
23
  = f.price_field :prorated_nov, label: "November"
30
24
  = f.price_field :prorated_dec, label: "December"
31
-
32
- = f.submit
@@ -1,14 +1,10 @@
1
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
2
- %h3 Wizard Steps
3
-
4
- %p The following steps will be required when applying for this membership category.
5
-
2
+ %h3 Applicant Wizard Steps
6
3
  - f.object.applicant_wizard_steps += EffectiveMemberships.Applicant.required_wizard_steps
7
- = f.checks :applicant_wizard_steps, f.object.applicant_wizard_steps_collection()
8
-
9
- %h3 Requirements
4
+ = f.checks :applicant_wizard_steps, f.object.applicant_wizard_steps_collection(), label: false
10
5
 
11
- %p The following numbers set the minimum number of required items an applicant must provide to complete the step. Leave blank for none.
6
+ %h3 Applicant Requirements
7
+ %p The following numbers set the minimum number of required items an applicant must provide to complete each step. Leave blank for none.
12
8
 
13
9
  - applicant = EffectiveMemberships.Applicant.new
14
10
 
@@ -1,15 +1,17 @@
1
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
2
- = f.text_field :title
2
+ .row
3
+ .col= f.text_field :title, label: 'Category title'
3
4
 
4
- = f.select :category_type, f.object.class.category_types,
5
- hint: 'When Organization, the organization will be given membership. Otherwise the individual user'
5
+ .col
6
+ = f.select :category_type, f.object.class.category_types,
7
+ hint: 'When Individual, the membership belongs to a person. When Organization, the organization will be given membership and the representatives will inherit their status.'
6
8
 
7
- - if f.object.class.categories.present?
8
- = f.select :category, f.object.class.categories
9
+ - if f.object.class.categories.present?
10
+ = f.select :category, f.object.class.categories
9
11
 
10
12
  - if defined?(EffectiveArticleEditor)
11
- = f.article_editor :rich_text_body, label: 'Body', hint: 'A quick description of this category. It is displayed on the Application Select Category step.'
13
+ = f.article_editor :rich_text_body, label: 'Description shown in the Application to Join wizard'
12
14
  - else
13
- = 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.'
15
+ = f.rich_text_area :rich_text_body, label: 'Description shown in the Application to Join wizard'
14
16
 
15
17
  = f.submit
@@ -1,5 +1,3 @@
1
- %p Each of the following content areas will be displayed on the fee payment wizard.
2
-
3
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
4
2
  = card("All Steps") do
5
3
  - if defined?(EffectiveArticleEditor)
@@ -7,8 +5,6 @@
7
5
  - else
8
6
  = f.rich_text_area "rich_text_fee_payment_all_steps_content", label: false, hint: "displayed on all steps"
9
7
 
10
- %hr
11
-
12
8
  - enabled = f.object.fee_payment_wizard_steps
13
9
 
14
10
  - EffectiveMemberships.FeePayment::WIZARD_STEPS.each do |step, title|
@@ -1,9 +1,6 @@
1
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
2
- %h3 Wizard Steps
3
-
4
- %p The following steps will be required when purchasing fees for this membership category.
5
-
2
+ %h3 Renewal Wizard Steps
6
3
  - f.object.fee_payment_wizard_steps += EffectiveMemberships.FeePayment.required_wizard_steps
7
- = f.checks :fee_payment_wizard_steps, f.object.fee_payment_wizard_steps_collection()
4
+ = f.checks :fee_payment_wizard_steps, f.object.fee_payment_wizard_steps_collection(), label: false
8
5
 
9
6
  = f.submit
@@ -1,6 +1,6 @@
1
1
  = effective_form_with(model: [:admin, category], engine: true) do |f|
2
2
  %h3 Renewal Fees
3
- = f.check_box :create_renewal_fees, label: 'Yes, renewal fees should be created'
3
+ = f.check_box :create_renewal_fees, label: 'Yes, annual renewal fees should be created'
4
4
 
5
5
  = f.show_if(:create_renewal_fees, true) do
6
6
  - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
@@ -1,3 +1,3 @@
1
1
  module EffectiveMemberships
2
- VERSION = '0.6.1'
2
+ VERSION = '0.6.2'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_memberships
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-24 00:00:00.000000000 Z
11
+ date: 2022-08-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -352,13 +352,11 @@ files:
352
352
  - app/views/admin/applicants/_form_transcripts.html.haml
353
353
  - app/views/admin/applicants/_status.html.haml
354
354
  - app/views/admin/categories/_form.html.haml
355
- - app/views/admin/categories/_form_applicant.html.haml
356
355
  - app/views/admin/categories/_form_applicant_content.html.haml
357
356
  - app/views/admin/categories/_form_applicant_eligibility.html.haml
358
357
  - app/views/admin/categories/_form_applicant_fees.html.haml
359
358
  - app/views/admin/categories/_form_applicant_steps.html.haml
360
359
  - app/views/admin/categories/_form_category.html.haml
361
- - app/views/admin/categories/_form_fee_payment.html.haml
362
360
  - app/views/admin/categories/_form_fee_payment_content.html.haml
363
361
  - app/views/admin/categories/_form_fee_payment_steps.html.haml
364
362
  - app/views/admin/categories/_form_renewals.html.haml
@@ -1,12 +0,0 @@
1
- = tabs do
2
- = tab 'Eligibility' do
3
- = render 'admin/categories/form_applicant_eligibility', category: category
4
-
5
- = tab 'Fees' do
6
- = render 'admin/categories/form_applicant_fees', category: category
7
-
8
- = tab 'Applicant Steps' do
9
- = render 'admin/categories/form_applicant_steps', category: category
10
-
11
- = tab 'Applicant Content' do
12
- = render 'admin/categories/form_applicant_content', category: category
@@ -1,9 +0,0 @@
1
- = tabs do
2
- = tab 'Renewals' do
3
- = render 'admin/categories/form_renewals', category: category
4
-
5
- = tab 'Fee Payment Steps' do
6
- = render 'admin/categories/form_fee_payment_steps', category: category
7
-
8
- = tab 'Fee Payment Content' do
9
- = render 'admin/categories/form_fee_payment_content', category: category