Suppression du numéro de fax des contacts

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 758c6752767497a01aa8fa3a3a918a1e362a6abf..ef1ac5eed892449be0367bd66d300a873ace762c 100644 (file)
--- a/lib/nos_oignons.rb
+++ b/lib/nos_oignons.rb
@@ -1,4 +1,20 @@
 #-*- coding: utf-8 -*-
+#
+# Système de gestion des adhésions de Nos oignons
+# Copyright © 2013-2014 Nos oignons <contact@nos-oignons.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'nos_oignons/git'
 require 'nos_oignons/mailman'
@@ -11,16 +27,16 @@ module NosOignons
   ADVISORS_EMAIL = 'deontologie@nos-oignons.net'
   MEMBER_MAILING_LIST = 'ag'
   CONTACT_INFO = <<-EOT.gsub(/^    /, '')
+    Identifiant SIREN 842 479 313
     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
 
@@ -53,15 +69,15 @@ 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|
-        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
-        next if member.reminded_on && member.reminded_on >= today
-        reminders = NosOignons::Reminder.all.sort_by(&:days).reverse
-        next if anniversary > today + reminders.first.days
+        next if member.membership_fee_paid_on >= anniversary - reminders.last.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
@@ -86,6 +102,9 @@ module NosOignons
 
         -- 
         Le robot du conseil d'administration
+
+                              GNU AGPLv3 © Nos oignons <contact@nos-oignons.net>
+                               git clone https://nos-oignons.net/gestion-adh.git
       END_OF_BODY
       mail = Mail.new :charset => 'utf-8',
                       :from => NosOignons::BOARD_EMAIL,