effective_memberships 0.7.1 → 0.7.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 +4 -4
- data/app/datatables/admin/effective_applicants_datatable.rb +3 -2
- data/app/datatables/effective_applicants_datatable.rb +4 -4
- data/app/views/effective/applicants/_summary.html.haml +1 -1
- data/app/views/effective/fees/_dashboard.html.haml +5 -5
- data/lib/effective_memberships/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 85036ca2aa1362333f21d1da76e3ce330607f39922e8a9200f33794e01d326db
|
|
4
|
+
data.tar.gz: a266929f23d85a651aa70b353b70041088f442a46c576a28458674bf1959b286
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b054a795fd94aadadb7d6986b1a4c9b2e7e375f7db63b94b3c3ce9e39ec7c6d1e035030db076777724e3d8a7bb47b33acbdd7dec3c81fbd2f01237d35bff2709
|
|
7
|
+
data.tar.gz: 38e7942eb0fcae97c12153442b390dc8d239c2ad26a8981287be8fb30d01808d263d6019445af11eb0a6e5f6676b8b0f167140b8ab0a13658d2e82327082d137
|
|
@@ -8,7 +8,8 @@ module Admin
|
|
|
8
8
|
end
|
|
9
9
|
|
|
10
10
|
datatable do
|
|
11
|
-
order :
|
|
11
|
+
order :updated_at
|
|
12
|
+
|
|
12
13
|
col :id, visible: false
|
|
13
14
|
|
|
14
15
|
col :status, search: effective_memberships_status_collection()
|
|
@@ -27,7 +28,7 @@ module Admin
|
|
|
27
28
|
col :approved_at, label: 'Approved', visible: false, as: :date
|
|
28
29
|
|
|
29
30
|
col :user
|
|
30
|
-
col :organization
|
|
31
|
+
col :organization, visible: false
|
|
31
32
|
|
|
32
33
|
col :applicant_type
|
|
33
34
|
col :category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
|
|
@@ -8,7 +8,9 @@ class EffectiveApplicantsDatatable < Effective::Datatable
|
|
|
8
8
|
col :category, label: 'Category'
|
|
9
9
|
col :status, search: effective_memberships_status_collection()
|
|
10
10
|
|
|
11
|
-
col :
|
|
11
|
+
col :orders
|
|
12
|
+
|
|
13
|
+
col :created_at, label: 'Created', as: :date, visible: false
|
|
12
14
|
col :updated_at, label: 'Updated', as: :date, visible: false
|
|
13
15
|
|
|
14
16
|
col :submitted_at, label: 'Submitted', as: :date
|
|
@@ -16,13 +18,11 @@ class EffectiveApplicantsDatatable < Effective::Datatable
|
|
|
16
18
|
col :missing_info_at, label: 'Missing Info', as: :date, visible: false
|
|
17
19
|
|
|
18
20
|
if EffectiveMemberships.applicant_reviews?
|
|
19
|
-
col :reviewed_at, label: 'Reviewed', as: :date
|
|
21
|
+
col :reviewed_at, label: 'Reviewed', as: :date, visible: false
|
|
20
22
|
end
|
|
21
23
|
|
|
22
24
|
col :approved_at, label: 'Approved', as: :date
|
|
23
25
|
|
|
24
|
-
col :orders
|
|
25
|
-
|
|
26
26
|
actions_col(show: false) do |applicant|
|
|
27
27
|
if applicant.draft?
|
|
28
28
|
dropdown_link_to('Continue', effective_memberships.applicant_build_path(applicant, applicant.next_step), 'data-turbolinks' => false)
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
- if membership.reregistered?
|
|
32
32
|
and last changed on #{membership.registration_on.strftime('%F')}
|
|
33
33
|
|
|
34
|
-
= collapse('show
|
|
34
|
+
= collapse('show membership history', card_class: '') do
|
|
35
35
|
%p #{applicant.owner} membership history
|
|
36
36
|
= render_datatable(Admin::EffectiveMembershipHistoriesDatatable.new(owner: applicant.owner, actions: false), simple: true)
|
|
37
37
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
%h2 Fees
|
|
1
|
+
%h2 Fees and Dues
|
|
2
2
|
|
|
3
3
|
- memberships = current_user.memberships
|
|
4
4
|
- outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
- if memberships.present?
|
|
7
7
|
- if memberships.any? { |membership| membership.category.create_renewal_fees? }
|
|
8
8
|
- date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
|
|
9
|
-
%p Annual
|
|
9
|
+
%p Annual dues become available for purchase on #{date.strftime('%B %e')} of each year.
|
|
10
10
|
|
|
11
11
|
- if memberships.any? { |membership| membership.category.create_late_fees? }
|
|
12
12
|
- date = EffectiveMemberships.Registrar.late_fee_date(date: Time.zone.now)
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
|
|
15
15
|
- if memberships.any? { |membership| membership.category.create_bad_standing? }
|
|
16
16
|
- date = EffectiveMemberships.Registrar.bad_standing_date(date: Time.zone.now)
|
|
17
|
-
%p Memberships with unpaid fees will be marked in bad standing on #{date.strftime('%B %e')}.
|
|
17
|
+
%p Memberships with unpaid fees or dues will be marked in bad standing on #{date.strftime('%B %e')}.
|
|
18
18
|
|
|
19
19
|
- if outstanding_owners.present?
|
|
20
|
-
.alert.alert-warning.mb-3 You have outstanding fees ready to purchase.
|
|
20
|
+
.alert.alert-warning.mb-3 You have outstanding fees or dues ready to purchase.
|
|
21
21
|
|
|
22
22
|
%ul
|
|
23
23
|
- outstanding_owners.each do |owner|
|
|
@@ -31,4 +31,4 @@
|
|
|
31
31
|
%p= link_to 'Pay Fees', effective_memberships.new_fee_payment_path, class: 'btn btn-primary'
|
|
32
32
|
|
|
33
33
|
- else
|
|
34
|
-
%p You have no outstanding fees at this time. Thank you.
|
|
34
|
+
%p You have no outstanding fees or dues at this time. Thank you.
|