Correction des rappels d'adhésion lorsque le renouvellement a été fait avant la date...

[gestion-adh.git] / lib / nos_oignons.rb

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 4ccd04fd7b6c9dce8196046bff054ddf9a735324..dec787ead8983b25862d113040fd1664ad99eac5 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -54,10 +54,10 @@ module NosOignons
     def send_membership_reminders!
       today = Time.now.to_date
       NosOignons::Member.all.select(&:up_to_date?).each do |member|
+        reminders = NosOignons::Reminder.all.sort_by(&:days)
         anniversary = Time.new(today.year, member.joined_on.month,
                                member.joined_on.day).to_date
-        next if member.membership_fee_paid_on >= anniversary
-        reminders = NosOignons::Reminder.all.sort_by(&:days)
+        next if member.membership_fee_paid_on >= anniversary - reminders.last.days
         reminders.each do |reminder|
           next if (anniversary - today).to_i > reminder.days
           next if member.reminded_on && (anniversary - member.reminded_on).to_i <= reminder.days