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 66116bf7a5f7ba41892d23c3fb37677a4bc219b3..dec787ead8983b25862d113040fd1664ad99eac5 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -54,12 +54,13 @@ module NosOignons
     def send_membership_reminders!
       today = Time.now.to_date
       NosOignons::Member.all.select(&:up_to_date?).each do |member|
     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
         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
-        NosOignons::Reminder.all.sort_by(&:days).reverse.each do |reminder|
-          next if anniversary < today + reminder.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

 
           member.remind(reminder)
           break
 
           member.remind(reminder)
           break