From 809f4f9e1c52a2fa7322ead5402ffcaf28418091 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 20 Feb 2015 08:30:02 +0100 Subject: [PATCH] =?UTF-8?q?ajout=20Ga=C3=ABlle=20&=20paiement=20esp=C3=A8c?= =?UTF-8?q?e=20commandes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/newsletter.rb | 3 ++- app/views/admin/orders/_form.html.haml | 2 +- app/views/admin/orders/_new_form.html.haml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/newsletter.rb b/app/models/newsletter.rb index 43edbaf..4bc3f91 100755 --- a/app/models/newsletter.rb +++ b/app/models/newsletter.rb @@ -24,11 +24,12 @@ class Newsletter < ActiveRecord::Base #EMAIL_FROMS=["Le Pic Vert ", "Le Pic Vert "] - EMAIL_FROMS=["contact@lepicvert.asso.fr","m.botton@lepicvert.asso.fr","s.montchalin@lepicvert.asso.fr","m.perrot@lepicvert.asso.fr","s.chaudet@lepicvert.asso.fr","c.chauvet@lepicvert.asso.fr","c.paul@lepicvert.asso.fr","m.coulot@lepicvert.asso.fr","b.cambon@lepicvert.asso.fr"] + EMAIL_FROMS=["contact@lepicvert.asso.fr","m.botton@lepicvert.asso.fr","s.montchalin@lepicvert.asso.fr","g.chmargounof@lepicvert.asso.fr","m.perrot@lepicvert.asso.fr","s.chaudet@lepicvert.asso.fr","c.chauvet@lepicvert.asso.fr","c.paul@lepicvert.asso.fr","m.coulot@lepicvert.asso.fr","b.cambon@lepicvert.asso.fr"] EMAIL_TEXTES= { "contact@lepicvert.asso.fr" => ["Le Pic Vert",""], "s.montchalin@lepicvert.asso.fr" => ["Sonia - Le Pic Vert","Sonia Montchalin", "Animatrice nature et environnement"], + "g.chmargounof@lepicvert.asso.fr" => ["Gaëlle - Le Pic Vert","Gaëlle Chmargounof", "Animatrice nature et environnement"], "m.botton@lepicvert.asso.fr" => ["Martial - Le Pic Vert","Martial Botton","Coordinateur"], "s.chaudet@lepicvert.asso.fr" => ["Solenn - Le Pic Vert","Solenn Chaudet","Engagé service civique"], "c.chauvet@lepicvert.asso.fr" => ["Clément - Le Pic Vert","Clément Chauvet","Engagé service civique"], diff --git a/app/views/admin/orders/_form.html.haml b/app/views/admin/orders/_form.html.haml index 3de0697..692f2de 100644 --- a/app/views/admin/orders/_form.html.haml +++ b/app/views/admin/orders/_form.html.haml @@ -10,7 +10,7 @@ =form.input :cityname, :label => "Ville :" =form.input :country, :label => "Pays :", :as => :string - = form.input :payment_type, :label => "Type de paiement : ", :collection => {"Paypal" => "1", "Offert" => "2", "Chèque" => "3"}, :include_blank => false + = form.input :payment_type, :label => "Type de paiement : ", :collection => {"Paypal" => "1", "Offert" => "2", "Chèque" => "3","Espèces" => "4"}, :include_blank => false = form.input :paid_at, :label => "Date de paiement :", :as => :qi_date_picker =form.input :paid, :label => "Payé ?" diff --git a/app/views/admin/orders/_new_form.html.haml b/app/views/admin/orders/_new_form.html.haml index 3de0697..692f2de 100644 --- a/app/views/admin/orders/_new_form.html.haml +++ b/app/views/admin/orders/_new_form.html.haml @@ -10,7 +10,7 @@ =form.input :cityname, :label => "Ville :" =form.input :country, :label => "Pays :", :as => :string - = form.input :payment_type, :label => "Type de paiement : ", :collection => {"Paypal" => "1", "Offert" => "2", "Chèque" => "3"}, :include_blank => false + = form.input :payment_type, :label => "Type de paiement : ", :collection => {"Paypal" => "1", "Offert" => "2", "Chèque" => "3","Espèces" => "4"}, :include_blank => false = form.input :paid_at, :label => "Date de paiement :", :as => :qi_date_picker =form.input :paid, :label => "Payé ?"