effective_memberships 0.6.2 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5129f1448e268a4dd8977f9ad66e4d85f6ea9a2430f4ef5ac301a134f273fd
-  data.tar.gz: cc623fb32179f8157d28d80260ab32733fec716afbcdc0b887f76f1106fca241
+  metadata.gz: 276edc8f53de07b32c2a6f5467727cda1ca37a4748dd6fccf37fd8657150e1b8
+  data.tar.gz: '097342ca3d781331f2d660e0e027016b34c67d0f13f24b535b2703c0d30cf212'
 SHA512:
-  metadata.gz: 414b1c1c2b7a166fc214d35a62b6b7f5f19cddd6845852dfd0c1bc255720601673eb2607ba1456f1b5c28a92ca3092d92554577855965428e0eb2ffd7cd892b6
-  data.tar.gz: c78a8ebee8e8e56493e89519242ebcec959603f87f877c55683fea709fc29d09c7ac3de5260124e58b1a69021ad6abb0716584826518207ef9722a5a746e98ac
+  metadata.gz: 87669cf4f1bc83980b9f915916a509d1580cb4ba14545c178bf344f9dfe9f0c9c8c7b45f6e350fc38d1ae4aa9f2ef0c1de93382e8e310fc368623b007b4a1a4e
+  data.tar.gz: 1c71acefad1595cc972e63399a4709c1d934f1f487c439bf593feb8cdb9d2167a7ea703f2d36ad78e010c727e128d7548a0b26847538ea3ba81ab48d69ba3ba4

data/app/models/concerns/effective_memberships_applicant.rb

@@ -195,7 +195,7 @@ module EffectiveMembershipsApplicant
     before_validation(if: -> { (new_record? || current_step == :select) && owner.present? }) do
       self.applicant_type ||= can_apply_applicant_types_collection().first
       self.from_category = owner.membership&.category
-      self.from_status = owner.membership&.status
+      self.from_status = owner.membership&.status if reinstatement?
     end
 
     before_validation(if: -> { current_step == :experience }) do
@@ -559,7 +559,7 @@ module EffectiveMembershipsApplicant
   def can_apply_applicant_types_collection
     if owner.blank? || owner.membership.blank? || owner.membership.categories.blank?
       ['Apply to Join']
-    elsif owner.membership.statuses.present?
+    elsif owner.membership.statuses.any?(&:reinstatable?)
       ['Apply for Reinstatement', 'Apply to Join']
     else
       ['Apply to Reclassify']

data/app/models/concerns/effective_memberships_category.rb

@@ -169,6 +169,10 @@ module EffectiveMembershipsCategory
     category_type == 'Organization'
   end
 
+  def membership_number_required?
+    true
+  end
+
   def prorated_fee(date:)
     send("prorated_#{date.strftime('%b').downcase}").to_i
   end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -53,7 +53,6 @@ module EffectiveMembershipsRegistrar
 
     # Default Date and next number
     date ||= Time.zone.now
-    number = next_membership_number(owner, to: categories.first) if number.blank?
     period = period(date: date)
     period_end_on = period_end_on(date: date)
 
@@ -63,7 +62,8 @@ module EffectiveMembershipsRegistrar
     # Assign Dates
     membership.joined_on ||= date  # Only if not already present
 
-    # Assign Number
+    # Assign Number (this could be nil)
+    number = next_membership_number(owner, to: categories.first) if number.blank?
     membership.number ||= number
     membership.number_as_integer ||= (Integer(number) rescue nil)
 
@@ -111,7 +111,6 @@ module EffectiveMembershipsRegistrar
 
     # Default Date and next number
     date ||= Time.zone.now
-    number = next_membership_number(owner, to: to) if number.blank?
     period = period(date: date)
     period_end_on = period_end_on(date: date)
 
@@ -122,7 +121,8 @@ module EffectiveMembershipsRegistrar
     membership.joined_on ||= date  # Only if not already present
     membership.registration_on = date  # Always new registration_on
 
-    # Assign Number
+    # Assign Number (this could be nil)
+    number = next_membership_number(owner, to: to) if number.blank?
     membership.number = number
     membership.number_as_integer = (Integer(number) rescue nil)
 
@@ -151,7 +151,7 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  def reclassify!(owner, to:, date: nil, skip_fees: false)
+  def reclassify!(owner, to:, status: nil, date: nil, skip_fees: false)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
@@ -159,6 +159,7 @@ module EffectiveMembershipsRegistrar
 
     raise('expecting a to memberships category') unless to.class.respond_to?(:effective_memberships_category?)
     raise('expecting a from memberships category') unless from.class.respond_to?(:effective_memberships_category?)
+    raise('expecting a memberships status') unless status.nil? || status.class.respond_to?(:effective_memberships_status?)
     raise('expected to and from to be different') if from == to
 
     date ||= Time.zone.now
@@ -171,6 +172,9 @@ module EffectiveMembershipsRegistrar
     membership.build_membership_category(category: to)
     membership.membership_category(category: from).mark_for_destruction
 
+    # Assign Status
+    membership.build_membership_status(status: status) if status.present?
+
     unless skip_fees
       fee = owner.build_prorated_fee(date: date)
       raise('already has purchased prorated fee') if fee.purchased?
@@ -305,7 +309,11 @@ module EffectiveMembershipsRegistrar
 
   def next_membership_number(owner, to:)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless Array(to).all? { |to| to.class.respond_to?(:effective_memberships_category?) }
+
+    categories = Array(to)
+    raise('expecting a membership category') unless categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+
+    return nil if categories.none?(&:membership_number_required?)
 
     # Just a simple number right now
     number = (Effective::Membership.all.max_number || 0) + 1

data/app/models/concerns/effective_memberships_status.rb

@@ -68,4 +68,9 @@ module EffectiveMembershipsStatus
     status_type == 'Organization'
   end
 
+  # Used for Apply to Join Reinstatement
+  def reinstatable?
+    true
+  end
+
 end

data/app/models/effective/membership.rb

@@ -51,10 +51,12 @@ module Effective
     end
 
     before_validation(if: -> { number_changed? }) do
-      self.number_as_integer = (Integer(number) rescue nil)
+      self.number_as_integer = (number.present? ? (Integer(number) rescue nil) : nil)
     end
 
-    validates :number, presence: true, uniqueness: true
+    validates :number, uniqueness: { allow_blank: true }
+    validates :number, presence: true, if: -> { categories.any?(:membership_number_required?) }
+
     validates :joined_on, presence: true
     validates :registration_on, presence: true
     validates :membership_categories, presence: true
@@ -80,7 +82,7 @@ module Effective
         (statuses.to_sentence if statuses.present?),
         (categories.to_sentence if categories.present?),
         'member',
-        "##{number_was}",
+        ("##{number_was}" if number_was.present?),
         "who joined #{joined_on&.strftime('%F') || '-'}",
         ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on),
         (". Membership is Not In Good Standing because #{bad_standing_reason}" if bad_standing?)

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

@@ -3,7 +3,10 @@
 
   = card do
     - if resource.min_applicant_equivalences > 0
-      .alert.alert-danger You must include #{resource.min_applicant_equivalences} or more equivalent memberships.
+      %p You must include #{resource.min_applicant_equivalences} or more equivalent memberships.
+
+    - if resource.min_applicant_equivalences == 0
+      %p Equivalent memberships are not required. Click the Remove button to skip adding memberships.
 
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id

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

@@ -8,6 +8,9 @@
     - if resource.min_applicant_experiences_months > 0
       %p You must include #{resource.min_applicant_experiences_months} or more months of experience.
 
+    - if resource.min_applicant_educations == 0 && resource.min_applicant_experiences_months == 0
+      %p Work experience is not required. Click the Remove button to skip adding work experience.
+
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :id
       = f.error :applicant_experiences

data/lib/effective_memberships/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails