Nouvelle tentative de correction des rappels d'adhésion

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 758c6752767497a01aa8fa3a3a918a1e362a6abf..4ccd04fd7b6c9dce8196046bff054ddf9a735324 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -57,11 +57,10 @@ module NosOignons
         anniversary = Time.new(today.year, member.joined_on.month,
                                member.joined_on.day).to_date
         next if member.membership_fee_paid_on >= anniversary
-        next if member.reminded_on && member.reminded_on >= today
-        reminders = NosOignons::Reminder.all.sort_by(&:days).reverse
-        next if anniversary > today + reminders.first.days
+        reminders = NosOignons::Reminder.all.sort_by(&:days)
         reminders.each do |reminder|
-          next if anniversary < today + reminder.days
+          next if (anniversary - today).to_i > reminder.days
+          next if member.reminded_on && (anniversary - member.reminded_on).to_i <= reminder.days
 
           member.remind(reminder)
           break