X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/62dfc06362143c4fd95b86b4d511c3ade7346f4e..01f97846a9919f81d6af6fdd76bdac0fc14572a4:/lib/nos_oignons.rb

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 72cea22..ef1ac5e 100644
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -31,13 +31,12 @@ module NosOignons
     https://nos-oignons.net/
     contact@nos-oignons.net
     Téléphone : +33 9 72 42 96 04
-    Fax : +33 9 72 42 96 06
   EOT
   POSTAL_ADDRESS = <<-EOT.gsub(/^    /, '')
     Nos oignons
     Centre UBIDOCA, 7585
-    105 route des Pommiers
-    74370 Saint Martin Bellevue
+    78 allée Primavera
+    74370 Annecy
     France
   EOT
 
@@ -70,10 +69,10 @@ module NosOignons
 
     def send_membership_reminders!
       today = Time.now.to_date
+      reminders = NosOignons::Reminder.all.sort_by(&:days)
       NosOignons::Member.all.select(&:up_to_date?).each do |member|
-        next if member.membership_fee_paid_on.year == today.year
-        reminders = NosOignons::Reminder.all.sort_by(&:days)
-        anniversary = Time.new(today.year, member.joined_on.month,
+        next if member.membership_fee_paid_on.year == (today + reminders.last.days).year
+        anniversary = Time.new(today.next_month.year, member.joined_on.month,
                                member.joined_on.day).to_date
         next if member.membership_fee_paid_on >= anniversary - reminders.last.days
         reminders.each do |reminder|