effective_memberships 0.9.14 → 0.9.15
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e299db8cf3241529169d0f61a9524263dce1b1752fb04cbec395951ae7d1d029
|
|
4
|
+
data.tar.gz: e04637274efa4c3bffae73bbd27b62588ec3f6c74379050f51c58609f513bbc0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d01059e8b8e98c6c5ed0838a15a4b126a6d031cbaea7f76adb19146985f687514f5d518ca05bebbf6b9b3735739efd26c63a5d3a970097572d836cadb478c01
|
|
7
|
+
data.tar.gz: 00da75ee33edb063d76280cfb6bd1c771903ff24bdab9db0bf5c0ca06cc76e0998bd72313705ae0bf2ef90acf0c37dc4703b9fc5b3d15b34808f13606ccf38bc
|
|
@@ -607,7 +607,7 @@ module EffectiveMembershipsApplicant
|
|
|
607
607
|
def can_apply_applicant_types_collection
|
|
608
608
|
if owner.blank?
|
|
609
609
|
['Apply to Join']
|
|
610
|
-
elsif owner.membership_removed?
|
|
610
|
+
elsif owner.membership_removed? && owner.reinstatement_membership_history.present?
|
|
611
611
|
['Apply for Reinstatement', 'Apply to Join']
|
|
612
612
|
elsif owner.membership.blank? || owner.membership.categories.blank?
|
|
613
613
|
['Apply to Join']
|
|
@@ -144,11 +144,11 @@ module EffectiveMembershipsOwner
|
|
|
144
144
|
end
|
|
145
145
|
|
|
146
146
|
def reinstatement_membership_category
|
|
147
|
-
reinstatement_membership_history
|
|
147
|
+
reinstatement_membership_history&.membership_categories&.first
|
|
148
148
|
end
|
|
149
149
|
|
|
150
150
|
def reinstatement_membership_statuses
|
|
151
|
-
reinstatement_membership_history
|
|
151
|
+
reinstatement_membership_history&.membership_statuses
|
|
152
152
|
end
|
|
153
153
|
|
|
154
154
|
def registrar_action_categories(action)
|
|
@@ -35,6 +35,8 @@
|
|
|
35
35
|
|
|
36
36
|
- if current_user.membership_removed?
|
|
37
37
|
%p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.
|
|
38
|
+
|
|
39
|
+
- if current_user.reinstatement_membership_history.present?
|
|
38
40
|
%p You may Apply for Reinstatement to #{current_user.reinstatement_membership_category} by clicking the Apply to Join button below and then complete the wizard.
|
|
39
41
|
|
|
40
42
|
- if membership_organizations.present?
|