Pas d'envoi de rappels si la cotisation a déjà été payée dans l'année

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

diff --git a/lib/nos_oignons.rb b/lib/nos_oignons.rb
index 86be0fdc285bfad54659a709e4df18a46bf3899b..72cea229df4d17cde186b8389b5ff746c0b22d21 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,6 +27,7 @@ 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
@@ -26,9 +43,9 @@ module NosOignons
 
   # The following class methods are all meant to be called as command-line scripts
   class << self
-    def create_membership_fee_reciept!(member_id, amount)
+    def create_membership_fee_receipt!(member_id, amount)
       member = NosOignons::Member.new(member_id)
-      member.create_reciept!(amount)
+      member.create_receipt!(amount)
     end
 
     def list_emails!
@@ -54,12 +71,14 @@ module NosOignons
     def send_membership_reminders!
       today = Time.now.to_date
       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,
                                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
@@ -69,14 +88,14 @@ module NosOignons
 
     def send_member_emails_to_advisors!
       uptodate_emails = NosOignons::Member.all.select(&:up_to_date?).collect(&:email)
-      subject = 'Adresses emails des members à jour de cotisation'
+      subject = 'Adresses email des membres à jour de cotisation'
       body = <<-END_OF_BODY.gsub(/^        /, '')
         Cher comité de déontologie de Nos oignons,
 
-       Comme le prévoit les statuts l'article 12 des statuts de l'association,
-        vous devez être en mesure de pouvoir convoquer une assemblée générale
-        extraordinaire. Pour ce faire, voici donc la liste des emails à jour
-        de cotisation à la date d'aujourd'hui :
+        Comme le prévoient les statuts l'article 12 des statuts de
+        l'association, vous devez être en mesure de pouvoir convoquer une
+        assemblée générale extraordinaire. Pour ce faire, voici donc la liste
+        des emails à jour de cotisation à la date d'aujourd'hui :
 
         #{uptodate_emails.join("\n")}
 
@@ -84,6 +103,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,