effective_memberships 0.17.7 → 0.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1c595c47725e74e8e78cd82360ca33ef5bb778a47f217ecfa6fb8a30452df6b
-  data.tar.gz: 41f45a5ac18a4c0f6448620e6c0b1bcfd6c937028c28783b7b35225a620496f6
+  metadata.gz: 7a7ab7d95194d5d7c49af9f4d8297b4a9f927f9d4a2d97ea2f18ead660488685
+  data.tar.gz: 7412d96bc6f4b1c7329a3fa2b4998e0045d921f1deec09886f024f42b868afc7
 SHA512:
-  metadata.gz: c6d24ab45dfce8b8e8f4efd2c93ca865408f2a3c4de8db61b9c0163cc750d22b5eb955bcc1bb0ea6d2cd4f9905707902bbd89d56c95bec9a17e4e02098e52adf
-  data.tar.gz: 132237106d797e86db32d255ae35404ca34ea140879cc51d6445705e20fbbbf61f94f016cc2fd02e31629d139daf808a036812626b7af54e0523c44d777c399e
+  metadata.gz: 6aeaa23fda513f0b707252be4009fa6b25c19a8ee9f7ead8761a15893fa5b56a2b1ddba20da408e42f5d8c7759dc1b53c9faba19b20eecac28b5dfdf863c8703
+  data.tar.gz: d2abd9350b5b98b43db54214b9cdf4a8fdc40858a66a4ea8f0ad301870326d16892287ad5ae1ac4a8dda70db2545e0d4ed12092e2bf265b3ae249137323bc311

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -64,7 +64,13 @@ module Admin
         membership.owner.try(:addresses).try(:first).try(:postal_code)
       end
 
-      actions_col
+      actions_col do |membership|
+        if membership.owner_type.include?('Organization')
+          dropdown_link_to 'Show', "/admin/organizations/#{membership.owner.to_param}/edit#tab-membership", 'data-turbolinks': false
+        elsif membership.owner_type.include?('User')
+          dropdown_link_to 'Show', "/admin/users/#{membership.owner.to_param}/edit#tab-membership", 'data-turbolinks': false
+        end
+      end
     end
 
     collection do

data/app/models/concerns/effective_memberships_applicant.rb

@@ -192,7 +192,7 @@ module EffectiveMembershipsApplicant
 
     # effective_reports
     def reportable_scopes
-      { draft: nil, submitted: nil, in_progress: nil, done: nil }
+      { draft: nil, submitted: nil, missing_info: nil, completed: nil, reviewed: nil, declined: nil, approved: nil, in_progress: nil, done: nil }
     end
 
     scope :deep, -> { includes(:user, :organization, :category, :from_category, :from_status, :orders) }
@@ -202,7 +202,6 @@ module EffectiveMembershipsApplicant
     scope :done, -> { where(status: [:approved, :declined]) }
 
     scope :not_draft, -> { where.not(status: :draft) }
-
     scope :reviewable, -> { where.not(status: [:draft, :submitted, :declined, :approved]) }
 
     scope :for, -> (user) {
@@ -251,6 +250,23 @@ module EffectiveMembershipsApplicant
       validates :category, presence: true
     end
 
+    # Select Step - Check for expired reclassification or reinstatement dates
+    validate(if: -> { current_step == :select && owner.present? && applicant_type.present? && category.present? }) do
+      # Dates
+      today = (created_at || Time.zone.now).beginning_of_day
+
+      reclassification_expires_on = owner.reclassification_expires_on(from: from_category, to: category)
+      reinstatement_expires_on = owner.reinstatement_expires_on(from: from_status)
+
+      if reclassification? && reclassification_expires_on.present? && reclassification_expires_on <= today
+        errors.add(:base, "Your ability to apply for reclassification expired on #{reclassification_expires_on.strftime('%F')}. Please contact us for assistance.")
+      end
+
+      if reinstatement? && reinstatement_expires_on.present? && reinstatement_expires_on <= today
+        errors.add(:base, "Your ability to apply for reinstatement expired on #{reinstatement_expires_on.strftime('%F')}. Please contact us for assistance.")
+      end
+    end
+
     # They can checkout with outstanding fees
     # validate(if: -> { current_step == :select && owner.present? }) do
     #   self.errors.add(:base, 'may not have outstanding fees') if owner.outstanding_fee_payment_fees.present?

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -29,6 +29,7 @@ module EffectiveMembershipsApplicantReview
 
   included do
     log_changes(to: :applicant) if respond_to?(:log_changes)
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     acts_as_tokened
 
@@ -59,6 +60,15 @@ module EffectiveMembershipsApplicantReview
       timestamps
     end
 
+    # effective_reports
+    def reportable_scopes
+      { in_progress: nil, done: nil }
+    end
+
+    def reportable_email
+      reviewer.try(:email)
+    end
+
     scope :deep, -> { includes(:reviewer, applicant: [:user, :applicant_reviews]) }
 
     scope :for, -> (user) {

data/app/models/concerns/effective_memberships_category.rb

@@ -313,4 +313,8 @@ module EffectiveMembershipsCategory
     nil
   end
 
+  def reclassification_expires_in
+    nil # 2.years
+  end
+
 end

data/app/models/concerns/effective_memberships_owner.rb

@@ -137,6 +137,44 @@ module EffectiveMembershipsOwner
     removed_membership_history.start_on if membership_removed?
   end
 
+  # Checked by the applicant on the select step
+  def reclassification_expires_on(from: nil, to: nil)
+    return unless membership.present?
+
+    # User/owner might respond to this
+    date = try(:admin_reclassification_expires_on)
+    return date if date.present?
+
+    # When we last reclassified to our current category
+    history = last_membership_history(category: membership.membership_categories.first)
+    reclassified_on = (history&.start_on || membership.registration_on || membership.joined_on)
+
+    # Otherwise consider the membership categories
+    expires_on = membership.categories.select { |category| category.reclassification_expires_in.present? }.map do |category|
+      reclassified_on + category.reclassification_expires_in
+    end.min
+
+    expires_on
+  end
+
+  def reinstatement_expires_on(from: nil)
+    return unless membership_removed?
+
+    # User/owner might respond to this
+    date = try(:admin_reinstatement_expires_on)
+    return date if date.present?
+
+    # When we were removed
+    removed_on = removed_membership_history.start_on
+
+    # Consider any membership statuses that have reinstatement expires in
+    expires_on = removed_membership_history.membership_statuses.select { |status| status.reinstatement_expires_in.present? }.map do |status|
+      removed_on + status.reinstatement_expires_in
+    end.min
+
+    expires_on
+  end
+
   # The membership history that is removed. Has exit statuses that may affect reinstatement fees.
   def removed_membership_history
     membership_histories.reverse.find { |history| history.removed? } if membership_removed?
@@ -444,6 +482,14 @@ module EffectiveMembershipsOwner
     membership_histories.find { |history| (history.start_on..history.end_on).cover?(date) } # Ruby 2.6 supports endless ranges
   end
 
+  def first_membership_history(category: nil)
+    membership_histories.find { |history| category.blank? || history.membership_category_ids.include?(category.id) }
+  end
+
+  def last_membership_history(category: nil)
+    membership_histories.reverse.find { |history| category.blank? || history.membership_category_ids.include?(category.id) }
+  end
+
   # Point out busted data
   def membership_history_errors
     return unless membership.present?

data/app/models/concerns/effective_memberships_status.rb

@@ -76,9 +76,8 @@ module EffectiveMembershipsStatus
     title == 'Not In Good Standing'
   end
 
-  # Used for Apply to Join Reinstatement
-  def reinstatable?
-    true
+  def reinstatement_expires_in
+    nil # 2.years
   end
 
 end

data/app/models/effective/applicant_reference.rb

@@ -11,6 +11,7 @@ module Effective
     )
 
     log_changes(to: :applicant) if respond_to?(:log_changes)
+    acts_as_reportable if respond_to?(:acts_as_reportable)
 
     belongs_to :applicant, polymorphic: true, optional: true
 
@@ -52,6 +53,20 @@ module Effective
       timestamps
     end
 
+    # effective_reports
+    def reportable_scopes
+      { in_progress: nil, done: nil, expired: nil }
+    end
+
+    scope :in_progress, -> { with_submitted_applicants.where(status: :submitted) }
+    scope :done, -> { where(status: :completed) }
+
+    scope :expired, -> { where(status: :submitted).where.not(with_submitted_applicants) }
+
+    scope :with_submitted_applicants, -> {
+      where(applicant_id: EffectiveMemberships.Applicant.submitted)
+    }
+
     scope :deep, -> { all }
 
     # All step validations

data/app/models/effective/membership.rb

@@ -11,6 +11,7 @@ module Effective
     has_many :membership_statuses, -> { order(:id) }, inverse_of: :membership, dependent: :delete_all
     accepts_nested_attributes_for :membership_statuses
 
+    acts_as_reportable if respond_to?(:acts_as_reportable)
     log_changes(to: :owner) if respond_to?(:log_changes)
 
     effective_resource do
@@ -35,7 +36,23 @@ module Effective
     scope :deep, -> { includes(:owner, membership_categories: :category, membership_statuses: :status) }
     scope :sorted, -> { order('lower(owner_name)') }
 
+    # effective_reports
+    def reportable_scopes
+      {
+        with_category: :string,
+        with_status: :string,
+        joined_before: :date,
+        joined_after: :date,
+        with_paid_fees_through: :date,
+        with_unpaid_fees_through: :date,
+        in_good_standing: nil,
+        not_in_good_standing: nil
+      }
+    end
+
     scope :with_status, -> (statuses) {
+      statuses = Resource.new(EffectiveMemberships.Status).search_any(statuses) if statuses.kind_of?(String)
+
       raise('expected an EffectiveMemberships.Status') unless statuses.class.respond_to?(:effective_memberships_status?) || Array(statuses).all? { |status| status.kind_of?(EffectiveMemberships.Status) }
       where(id: MembershipStatus.where(status_id: statuses).select(:membership_id))
     }
@@ -46,6 +63,8 @@ module Effective
     }
 
     scope :with_category, -> (categories) {
+      categories = Resource.new(EffectiveMemberships.Category).search_any(categories) if categories.kind_of?(String)
+
       raise('expected an EffectiveMemberships.Category') unless categories.class.respond_to?(:effective_memberships_category?) || Array(categories).all? { |cat| cat.kind_of?(EffectiveMemberships.Category) }
       where(id: MembershipCategory.where(category_id: categories).select(:membership_id))
     }

data/app/models/effective/membership_history.rb

@@ -2,6 +2,8 @@ module Effective
   class MembershipHistory < ActiveRecord::Base
     belongs_to :owner, polymorphic: true
 
+    acts_as_reportable if respond_to?(:acts_as_reportable)
+
     effective_resource do
       start_on        :date
       end_on          :date
@@ -13,20 +15,32 @@ module Effective
       categories      :text
       category_ids    :text
 
+      statuses        :text
+      status_ids      :text
+
       notes           :text
 
       timestamps
     end
 
+    # TODO: Rename categories to be category_toses
+    # And membreship_categories below should be called categories
+
     serialize :categories, Array
     serialize :category_ids, Array
 
     serialize :statuses, Array
     serialize :status_ids, Array
 
+    # effective_reports
+    def reportable_scopes
+      { removed: nil, not_removed: nil }
+    end
+
     scope :deep, -> { includes(:owner) }
     scope :sorted, -> { order(:start_on).order(:id) }
 
+    scope :not_removed, -> { where(removed: false) }
     scope :removed, -> { where(removed: true) }
 
     validates :owner, presence: true

data/app/views/admin/memberships/_form_membership.html.haml

@@ -9,6 +9,8 @@
 
   = f.static_field :current_action, label: 'Current Membership' do
     = membership.to_s
+    = render('effective/memberships/reclassification', user: membership.owner)
+    = render('effective/memberships/reinstatement', user: membership.owner)
 
   = f.check_box :current_action, label: 'Yes, update membership information'
 

data/app/views/effective/memberships/_dashboard.html.haml

@@ -33,11 +33,14 @@
   - if membership.not_in_good_standing?
     %p Your membership is Not In Good Standing because of unpurchased fees or dues. Please purchase these dues or contact us.
 
+- if membership.present?
+  = render('effective/memberships/reclassification', user: current_user)
+
 - if current_user.membership_removed?
   %p Your membership was removed on #{current_user.membership_removed_on.strftime('%F')}.
 
 - if current_user.reinstatement_membership_history.present?
-  %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.
+  = render('effective/memberships/reinstatement', user: current_user)
 
 - if membership_organizations.present?
   %p You are a representative for #{pluralize(membership_organizations.length, 'member organization')}.

data/app/views/effective/memberships/_reclassification.html.haml

@@ -0,0 +1,14 @@
+- if user.membership.present?
+  - now = Time.zone.now.beginning_of_day
+  - applicants = user.applicants.select { |applicant| applicant.in_progress? }
+
+  - if applicants.blank?
+    - expires_on = user.reclassification_expires_on
+    - category = user.membership.categories.to_sentence
+
+    - if expires_on.blank?
+      - # Nothing to do
+    - elsif now < expires_on
+      %p You have until #{expires_on.strftime('%F')}, #{distance_of_time_in_words(now, expires_on)} from now, to Apply for Reclassification from #{category}.
+    - else
+      %p Your ability to Apply for Reclassification from #{category} expired on #{expires_on.strftime('%F')}.

data/app/views/effective/memberships/_reinstatement.html.haml

@@ -0,0 +1,14 @@
+- if user.reinstatement_membership_history.present?
+  - now = Time.zone.now.beginning_of_day
+  - applicants = user.applicants.select { |applicant| applicant.in_progress? }
+
+  - if applicants.blank?
+    - category = user.reinstatement_membership_category
+    - expires_on = user.reinstatement_expires_on
+
+    - if expires_on.blank?
+      - # Nothing to do
+    - elsif now < expires_on
+      %p You have until #{expires_on.strftime('%F')}, #{distance_of_time_in_words(now, expires_on)} from now, to Apply for Reinstatement to #{category}.
+    - else
+      %p Your ability to Apply for Reinstatement to #{category} expired on #{expires_on.strftime('%F')}.

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.17.7'
+  VERSION = '0.17.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.17.7
+  version: 0.17.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -525,6 +525,8 @@ files:
 - app/views/effective/membership_directory/show.html.haml
 - app/views/effective/memberships/_dashboard.html.haml
 - app/views/effective/memberships/_membership.html.haml
+- app/views/effective/memberships/_reclassification.html.haml
+- app/views/effective/memberships/_reinstatement.html.haml
 - app/views/effective/memberships_mailer/applicant_approved.liquid
 - app/views/effective/memberships_mailer/applicant_completed.liquid
 - app/views/effective/memberships_mailer/applicant_declined.liquid