effective_memberships 0.9.16 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90078c67d46aca1f293b49ffacac17288bb24592a4007079e6843847845a4e48
-  data.tar.gz: 0063d4f68e0c2ff073c06eb62812006d13f050b50eecbc10163aa80f0a862a04
+  metadata.gz: '09cdd3d71c709fdaacb54d4abd0d21217bd6e7e3a7395e687004eb124994b75b'
+  data.tar.gz: caebcbe36b5c113d715e47ef8df0d224f7ea825ae0fa3ea3f5efc59448bcc30f
 SHA512:
-  metadata.gz: 01b87e4c9a1aa5664e5bb0fb14ca95a3fac57ea8f2ca0542e379e7e11a1d0450c7aef6fcd4b8d29ab3312e6db33e4a3729b60301b54870e0d7abe20f144df93b
-  data.tar.gz: e71ea11d0e5d126f4e37474726a234440f6e2105131a57fd1a6427c9c2ab897884f3502df0f2150a89318748b494d156a1e11d3fd81334aab8d9c19d9c2ef533
+  metadata.gz: 50897b485cca843711185839c1e630b90211ac1559c7a956fd5d425d70a37ad7ef94b6a3863cd1055ac8efa226ef635a4b6186f32763e260c277cb198b4c7f3c
+  data.tar.gz: 0a53cc0947501e0f89c07d56e052b81f5b6a7f2c676698e5e45227f0c9ae460b8c674d90fd0bc521601eb5adef49ab07d1433ce6ccd5f80fcefb670b6c9845d6

data/app/models/concerns/effective_memberships_owner.rb

@@ -99,6 +99,10 @@ module EffectiveMembershipsOwner
     fees.select { |fee| fee.fee_payment_fee? && !fee.purchased? }
   end
 
+  def outstanding_renewal_fees
+    fees.select { |fee| fee.fee_type == 'Renewal' && !fee.purchased? }
+  end
+
   def outstanding_fee_payments
     fee_payments = EffectiveMemberships.FeePayment.all
 
@@ -263,8 +267,25 @@ module EffectiveMembershipsOwner
     # Build the renewal fee
     fee ||= fees.build()
 
-    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
-    not_in_good_standing_on ||= EffectiveMemberships.Registrar.not_in_good_standing_date(period: period) if category.create_not_in_good_standing?
+    # Late on this period's late date, or 60 days, whichever is later
+    late_on ||= if category.create_late_fees?
+      late_date = EffectiveMemberships.Registrar.late_fee_date(period: period)
+
+      duration = EffectiveMemberships.Registrar.min_late_duration
+      min_date = ((fee.created_at || Time.zone.now) + duration) if duration.present?
+
+      [late_date, min_date].compact.max
+    end
+
+    # NIGS on this period's late date, or 60 days, whichever is later
+    not_in_good_standing_on ||= if category.create_not_in_good_standing?
+      nigs_date = EffectiveMemberships.Registrar.not_in_good_standing_date(period: period)
+
+      duration = EffectiveMemberships.Registrar.min_not_in_good_standing_duration
+      min_date = ((fee.created_at || Time.zone.now) + duration) if duration.present?
+
+      [nigs_date, min_date].compact.max
+    end
 
     fee.assign_attributes(
       fee_type: 'Renewal',

data/app/models/concerns/effective_memberships_registrar.rb

@@ -33,6 +33,18 @@ module EffectiveMembershipsRegistrar
     raise('to be implemented by app registrar')
   end
 
+  # A renewal fee must be at least this old to be considered late?
+  # Must be less than (late_fee_date - renewal_fee_date) but this is not enforced
+  def min_late_duration
+    60.days
+  end
+
+  # A renewal fee must be at least this old to be considered nigs?
+  # Must be less than (nigs_date - renewal_fee_date) but this is not enforced
+  def min_not_in_good_standing_duration
+    60.days
+  end
+
   # scope
   def not_in_good_standing_status
     EffectiveMemberships.Status.where(title: 'Not In Good Standing')
@@ -156,6 +168,7 @@ module EffectiveMembershipsRegistrar
     raise('expected to and from to be different') if from == to
 
     date ||= Time.zone.now
+    period = period(date: date)
 
     # Existing Membership
     membership = owner.membership
@@ -171,11 +184,18 @@ module EffectiveMembershipsRegistrar
     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?
+      existing = owner.membership_period_fee(category: from, period: period)
 
-      fee = owner.build_discount_fee(date: date, from: from)
-      raise('already has purchased discount fee') if fee.purchased?
+      if existing
+        fee = owner.build_prorated_fee(date: date)
+        raise('already has purchased prorated fee') if fee.purchased?
+
+        fee = owner.build_discount_fee(date: date, from: from)
+        raise('already has purchased discount fee') if fee.purchased?
+      else
+        fee = owner.build_renewal_fee(category: to, period: period)
+        raise('already has purchased renewal fee') if fee.purchased?
+      end
     end
 
     save!(owner, date: date)

data/app/models/effective/fee.rb

@@ -87,14 +87,26 @@ module Effective
       return false if late_on.blank?
       return false if purchased?
 
-      late_on <= Time.zone.now.to_date
+      now = Time.zone.now
+
+      if(duration = EffectiveMemberships.Registrar.min_late_duration).present?
+        return false if ((created_at || now) + duration > now)
+      end
+
+      late_on <= now.to_date
     end
 
     def not_in_good_standing?
       return false if not_in_good_standing_on.blank?
       return false if purchased?
 
-      not_in_good_standing_on <= Time.zone.now.to_date
+      now = Time.zone.now
+
+      if(duration = EffectiveMemberships.Registrar.min_not_in_good_standing_duration).present?
+        return false if ((created_at || now) + duration > now)
+      end
+
+      not_in_good_standing_on <= now.to_date
     end
 
     # Used by applicant.applicant_submit_fees

data/app/views/admin/applicants/_form_approve.html.haml

@@ -31,8 +31,11 @@
       %li A #{month} prorated fee
 
     - if applicant.reclassification?
-      %li A #{month} prorated fee to the new category
-      %li A #{month} discount fee from their old category
+      - if applicant.owner.outstanding_renewal_fees.present?
+        %li A renewal fee in their new category
+      - else
+        %li A #{month} prorated fee to the new category
+        %li A #{month} discount fee from their old category
 
     - if applicant.reinstatement?
       %li A #{month} prorated fee to their reinstatement category

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.9.16'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails