diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb index c17d898..bca06cb 100644 --- a/app/controllers/admin/sheets_controller.rb +++ b/app/controllers/admin/sheets_controller.rb @@ -19,7 +19,7 @@ class Admin::SheetsController < ApplicationController def recus date = Date.today - date = DateTime.new(2016, 1, 1).beginning_of_year + date = DateTime.new(2017, 1, 1).beginning_of_year @sheet_years = SheetYear.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year]) @donates = Donate.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year]) diff --git a/app/views/admin/sheets/recus.html.haml b/app/views/admin/sheets/recus.html.haml index 4fe4718..a2f38f7 100644 --- a/app/views/admin/sheets/recus.html.haml +++ b/app/views/admin/sheets/recus.html.haml @@ -1,6 +1,6 @@ -price_list = {} --i = 4 +-i = 2 -@sheet_years.each do |sheet_year| -price_list[sheet_year.amount.to_s] = true -i += 1 @@ -11,11 +11,11 @@ %em Cerfa %br - N° 11580*01 + N° 11580*03 %td{:style => "text-align:right;"} Numéro d'ordre du reçu %br - ="2016/"+("%04d" % i).to_s + ="2017/"+("%04d" % i).to_s %h2{:style => "text-align:center;"} Reçu dons aux œuvres @@ -150,6 +150,9 @@ %br Le =l Date.today + %br + %br + =image_tag "/sign-mcb.jpg", :style => "width:200px;" %div{:style =>"page-break-after:always" } @@ -168,11 +171,11 @@ %em Cerfa %br - N° 11580*01 + N° 11580*03 %td{:style => "text-align:right;"} Numéro d'ordre du reçu %br - ="2016/"+("%04d" % i).to_s + ="2017/"+("%04d" % i).to_s %h2{:style => "text-align:center;"} Reçu dons aux œuvres @@ -307,5 +310,8 @@ %br Le =l Date.today + %br + %br + =image_tag "/sign-mcb.jpg", :style => "width:200px;" %div{:style =>"page-break-after:always" } diff --git a/public/sign-mcb.jpg b/public/sign-mcb.jpg new file mode 100644 index 0000000..38d4c17 Binary files /dev/null and b/public/sign-mcb.jpg differ