Fix send-membership-reminders broken logic

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 2a5d4143464cc3c1e8b5919465f7dc30644999bf..4ecd3c4b7e23600c50d8b3c38c5adae4e48b5d56 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -35,14 +35,12 @@ 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|

+        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|
         NosOignons::Reminder.all.sort_by(&:days).reverse.each do |reminder|

-          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.membership_fee_paid_on > today - reminder.days
-          next if anniversary > today - reminder.days
-          next if member.reminded_on && member.reminded_on >= today
+          next if anniversary < today + reminder.days

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