Update our address

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index b85ebeaec4d255c2cc5ff3426726f2cca32d3bbe..ba39787aa1b8689bcfc9d56e4b09c24ccfac6757 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -36,8 +36,8 @@ module NosOignons
   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,9 +70,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|
-        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|