nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ajout Gaëlle & paiement espèce commandes

Browse Source
This commit is contained in:
Nicolas Bally 2015-02-20 08:30:02 +01:00
parent 03b2daffa5
commit 809f4f9e1c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/newsletter.rb
View File

@ -24,11 +24,12 @@ class Newsletter < ActiveRecord::Base
#EMAIL_FROMS=["Le Pic Vert <contact@lepicvert.asso.fr>", "Le Pic Vert <s.montchalin@lepicvert.asso.fr>"]
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"],

2
app/views/admin/orders/_form.html.haml
View File

@ -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é ?"

2
app/views/admin/orders/_new_form.html.haml
View File

@ -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é ?"