sheets in mails.

app/controllers/newsletters_controller.rb

@@ -78,9 +78,9 @@ class NewslettersController < ApplicationController
   end
   
   
-  def send_helper(newsletter, email)
+  def send_helper(newsletter, email, options = {})
     begin
-      NewsletterMails.newsletter(newsletter, email).deliver if email and email != "" 
+      NewsletterMails.newsletter(newsletter, email, options).deliver if email and email != "" 
     rescue
       @errors << "<span class'error'>#{p.email}</span>"
     end
@@ -95,7 +95,7 @@ class NewslettersController < ApplicationController
         if pn.person
           p =pn.person
           
-          send_helper(@newsletter, p.email) if p.newsletter
+          send_helper(@newsletter, p.email, :people_newsgroup => pn, :person => p, :sheet => p.sheet) if p.newsletter
         
         end
       end
@@ -108,11 +108,11 @@ class NewslettersController < ApplicationController
       @persons = Person.find(:all, :conditions => {:sheet_id => params[:confirmed_sheets], :newsletter => true})
       
       @persons.each do |p|
-        send_helper(@newsletter, p.email) 
+        send_helper(@newsletter, p.email, :person => p, :sheet => p.sheet) 
       end
       
       @sheets.each do |s|
-       send_helper(@newsletter, s.other_mail) 
+       send_helper(@newsletter, s.other_mail, :sheet => s) 
      end
 
       

app/mailers/newsletter_mails.rb

@@ -3,8 +3,8 @@ class NewsletterMails < ActionMailer::Base
   
   default from: "Le Pic Vert <contact@lepicvert.asso.fr>"
 
-  def newsletter(newsletter,email)
+  def newsletter(newsletter,email, options = {})
-    
+    @options = options
     @newsletter = newsletter
     @email = email
     @title = @newsletter.title

app/views/layouts/mail.html.haml

@@ -28,9 +28,13 @@
         
       //#5bb1f3
       //#e16b13
-      //%tr{:style => "background:#5bb1f3;"}
+      //
-      //  %td{:colspan => "3", :style => "padding:10px;text-align:center;color:white;"}
+      -if @options[:sheet] and @options[:sheet].last_year < Date.today.year
-      //    Consultez toutes nos actualités sur notre site internet.
+        %tr{:style => "background:#e16b13;"}
+          %td{:colspan => "3", :style => "padding:10px;text-align:center;color:white;"}
+            Attention : votre adhésion n'a pas encore été renouvellée pour 
+            = Date.today.year
+            ="."
         
       
       %tr{:style => "background:#f4f3ef"}
@@ -52,7 +56,17 @@
             
         %td{:style => "padding-top:20px;vertical-align:top;padding-right:30px;color:#2d2d2d;width:300px;text-align:right;"}
           %p
-            
+            -if @options[:person]
+              Ce mail est envoyé à 
+              =@options[:person].firstname
+              =@options[:person].surname
+              %br
+            -if @options[:sheet] and @options[:sheet].corporate?
+              =@options[:sheet].corporate
+            -if @options[:sheet]
+              Dernier renouvellement : 
+              =@options[:sheet].last_year
+              
     
       %tr{:style => "background:#393939;color:#f6f6f6;text-align:center;"}
         %td{:colspan => 3, :style => "padding:10px;font-size:12px;"} Vous recevez ce mail car vous êtes adhérent ou sympatisant de l'association Le Pic Vert. Si vous ne souhaitez plus recevoir de mail de notre part n'hésitez pas à nous contacter.