effective_memberships 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5630148361e363550dea41e32b75f80ce1534bd93a4c18873d724c7b0b9cd61
-  data.tar.gz: 46e7aa62a886f604e4ebbf9b80e76f44f3fe5ee933f9e5f468513d412007fd62
+  metadata.gz: 4cdabd18c745a7596a4d7d39fb50436a4f6464e88399c8ca4e4b77d58abaddeb
+  data.tar.gz: 42df553cb0e753d4259f90a3358c4c3118ca847b5a8128d387de9a2b130a49a5
 SHA512:
-  metadata.gz: 91fb28c6ba34f3ac0146219b14f613fb4d19b883963e268d1117bcd56d9f7fcdfb4c5bd807230c53d14d2aefc49eb525867cc23c370948562d881ad79a29029a
-  data.tar.gz: eb61306191817a7bde172a548d2cf373f3210b235857c1a35d6923522a7ffddafbeeff6124ce5ef2e8d2bb9161c32d0de606465738ee88aeb74adc2e15efc92e
+  metadata.gz: 2daa5ad4a3d3f8287b611d3482c32ef07a974bc5488c5adc08884e3f1ca58a7e44fb195ca22d31c4a1c57b8830865036238a584260f3633047f0f382caefcfe9
+  data.tar.gz: c904772304719fc3a34b472cb1b4b917909bf94185bc320c60ec691c2ad742bf98a78cb073516011c9669885844072b10ba2ac97ccd4b37987d46342c751e61c

data/app/models/concerns/effective_memberships_owner.rb

@@ -264,7 +264,7 @@ module EffectiveMembershipsOwner
 
     # Only continue if there is a late renewal fee for the same period
     renewal_fee = fees.find { |fee| fee.fee_type == 'Renewal' && fee.period == period && fee.category_id == category.id && fee.category_type == category.class.name }
-    return unless fee.present? || renewal_fee&.late?
+    return if fee.blank? && (renewal_fee.blank? || renewal_fee.late? == false)
 
     # Build the late fee
     fee ||= fees.build()
@@ -292,7 +292,7 @@ module EffectiveMembershipsOwner
     # Assign in bad standing
     if membership.bad_standing_admin?
       # Nothing to do
-    elsif bad_standing_fees.present?
+    elsif bad_standing_fees.present? && membership.categories.any?(&:create_bad_standing?)
       membership.bad_standing = true
       membership.bad_standing_reason = 'Unpaid Fees'
     else
@@ -385,5 +385,4 @@ module EffectiveMembershipsOwner
     end
   end
 
-
 end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -401,7 +401,7 @@ module EffectiveMembershipsRegistrar
     GC.start
 
     # Update Membership Status - Assign In Bad Standing
-    memberships.find_each { |membership| update_membership_status!(membership, period: period) }
+    memberships.find_each { |membership| create_bad_standing!(membership, period: period) }
     GC.start
 
     true
@@ -416,7 +416,7 @@ module EffectiveMembershipsRegistrar
       raise("expected build_renewal_fee to return a fee for period #{period}") unless fee.kind_of?(Effective::Fee)
       next if fee.purchased?
 
-      puts("Created renewal fee for #{membership.owner}") if fee.new_record? && !Rails.env.test?
+      puts("Created renewal fee for #{membership.owner}") if fee.new_record? && debug?
 
       fee.save!
     end
@@ -426,10 +426,18 @@ module EffectiveMembershipsRegistrar
     membership.categories.select(&:create_late_fees?).map do |category|
       fee = membership.owner.build_late_fee(category: category, period: period)
       next if fee.blank? || fee.purchased?
+
+      puts("Created late fee for #{membership.owner}") if fee.new_record? && debug?
+
       fee.save!
     end
   end
 
+  def create_bad_standing!(membership, period:)
+    return unless membership.categories.any?(&:create_bad_standing?)
+    update_membership_status!(membership, period: period)
+  end
+
   def update_membership_status!(membership, period: nil)
     membership.owner.update_membership_status!
   end
@@ -442,6 +450,10 @@ module EffectiveMembershipsRegistrar
 
   protected
 
+  def debug?
+    false
+  end
+
   def add_member_role(owner)
     owner.add_role(:member)
 

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

@@ -4,16 +4,16 @@
 - outstanding_owners = current_user.memberships_owners.select { |owner| owner.outstanding_fee_payment_fees.present? }
 
 - if memberships.present?
-  - if memberships.any? { |membership| membership.category.create_renewal_fees? }
+  - if memberships.any? { |membership| membership.categories.any?(&:create_renewal_fees?) }
     - date = EffectiveMemberships.Registrar.renewal_fee_date(date: Time.zone.now)
     %p Annual dues become available for purchase on #{date.strftime('%B %e')} of each year.
 
-  - if memberships.any? { |membership| membership.category.create_late_fees? }
-    - date = EffectiveMemberships.Registrar.late_fee_date(date: Time.zone.now)
+  - if memberships.any? { |membership| membership.categories.any?(&:create_late_fees?) }
+    - date = EffectiveMemberships.Registrar.late_fee_date(period: Time.zone.now)
     %p Late fees will be applied on #{date.strftime('%B %e')}.
 
-  - if memberships.any? { |membership| membership.category.create_bad_standing? }
-    - date = EffectiveMemberships.Registrar.bad_standing_date(date: Time.zone.now)
+  - if memberships.any? { |membership| membership.categories.any?(&:create_bad_standing?) }
+    - date = EffectiveMemberships.Registrar.bad_standing_date(period: Time.zone.now)
     %p Memberships with unpaid fees or dues will be marked in bad standing on #{date.strftime('%B %e')}.
 
 - if outstanding_owners.present?

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.7.3'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Code and Effect