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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2021-01-22 12:26:50 +01:00
parent 9abb8817f8
commit f2d3a52c87
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/orders_controller.rb
View File

@ -40,7 +40,7 @@ def show
if @order.save if @order.save
@order.order_products << OrderProduct.new(:name => "Observer et photographier la faune sans déranger", :description => "Exemplaire personnel", :price => 10.0, :slug => "observer-et-photographier-la-faune-sans-deranger") @order.order_products << OrderProduct.new(:name => "Observer et photographier la faune sans déranger", :description => "Exemplaire personnel", :price => 12.0, :slug => "observer-et-photographier-la-faune-sans-deranger")
@order.save @order.save

2
app/controllers/admin/sheets_controller.rb
View File

@ -19,7 +19,7 @@ class Admin::SheetsController < ApplicationController
def recus def recus
date = Date.today date = Date.today
date = DateTime.new(2019, 1, 1).beginning_of_year date = DateTime.new(2020, 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]) @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]) @donates = Donate.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year])

2
app/controllers/public/orders_controller.rb
View File

@ -12,7 +12,7 @@ class Public::OrdersController < ApplicationController
def create def create
@order = Order.new(params.require(:order).permit!) @order = Order.new(params.require(:order).permit!)
@order.order_products << OrderProduct.new(:name => "Observer et photographier la faune sans déranger", :description => "Exemplaire personnel", :price => 10.0, :slug => "observer-et-photographier-la-faune-sans-deranger") @order.order_products << OrderProduct.new(:name => "Observer et photographier la faune sans déranger", :description => "Exemplaire personnel", :price => 12.0, :slug => "observer-et-photographier-la-faune-sans-deranger")
if @order.save if @order.save
respond_to do |format| respond_to do |format|
format.html { redirect_to paid_by_paypal_public_order_path(@order.token)} format.html { redirect_to paid_by_paypal_public_order_path(@order.token)}

2
app/models/renew.rb
View File

@ -39,7 +39,7 @@ class Renew < ActiveRecord::Base
end end
YEAR = 2020 YEAR = 2021
def done_return def done_return
if self.ok and !self.return_done if self.ok and !self.return_done

10
app/views/admin/sheets/index.xls.erb
View File

@ -27,9 +27,9 @@
<Cell><Data ss:Type="String"> Dernier renouvellement </Data></Cell> <Cell><Data ss:Type="String"> Dernier renouvellement </Data></Cell>
<Cell><Data ss:Type="String"> Création de la fiche </Data></Cell> <Cell><Data ss:Type="String"> Création de la fiche </Data></Cell>
<Cell><Data ss:Type="String"> mise à jour</Data></Cell> <Cell><Data ss:Type="String"> mise à jour</Data></Cell>
<Cell><Data ss:Type="String"> Paiement pour 2019</Data></Cell> <Cell><Data ss:Type="String"> Paiement pour 2020</Data></Cell>
<Cell><Data ss:Type="String"> Type d'adhésion pour 2019</Data></Cell> <Cell><Data ss:Type="String"> Type d'adhésion pour 2020</Data></Cell>
<Cell><Data ss:Type="String"> Pouvoirs pour 2019</Data></Cell> <Cell><Data ss:Type="String"> Pouvoirs pour 2020</Data></Cell>
@ -68,8 +68,8 @@
<Cell><Data ss:Type="String"><%= sheet.last_year %></Data></Cell> <Cell><Data ss:Type="String"><%= sheet.last_year %></Data></Cell>
<Cell><Data ss:Type="String"><%= l sheet.created_at %></Data></Cell> <Cell><Data ss:Type="String"><%= l sheet.created_at %></Data></Cell>
<Cell><Data ss:Type="String"><%= l sheet.updated_at %></Data></Cell> <Cell><Data ss:Type="String"><%= l sheet.updated_at %></Data></Cell>
<% if sheet.sheet_years.where(:year => 2019).first %> <% if sheet.sheet_years.where(:year => 2020).first %>
<% sy = sheet.sheet_years.where(:year => 2019).first %> <% sy = sheet.sheet_years.where(:year => 2020).first %>
<Cell><Data ss:Type="String"><%= l(sy.paid_at) if sy.paid_at %></Data></Cell> <Cell><Data ss:Type="String"><%= l(sy.paid_at) if sy.paid_at %></Data></Cell>
<Cell><Data ss:Type="String"><%= SheetYear::JOIN_TYPE[sy.join_type] %></Data></Cell> <Cell><Data ss:Type="String"><%= SheetYear::JOIN_TYPE[sy.join_type] %></Data></Cell>

2
app/views/admin/sheets/recus.html.haml
View File

@ -1,6 +1,6 @@
-price_list = {} -price_list = {}
-i = 9 -i = 4
-@sheet_years.each do |sheet_year| -@sheet_years.each do |sheet_year|
-price_list[sheet_year.amount.to_s] = true -price_list[sheet_year.amount.to_s] = true
-i += 1 -i += 1