diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb
index b95bb5b..8e9c9a5 100644
--- a/app/controllers/admin/orders_controller.rb
+++ b/app/controllers/admin/orders_controller.rb
@@ -40,7 +40,7 @@ def show
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
diff --git a/app/controllers/admin/sheets_controller.rb b/app/controllers/admin/sheets_controller.rb
index 895cca3..608ae9b 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(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])
@donates = Donate.joins(:person).order("people.surname").find(:all, :conditions => ["paid_at >= ? and paid_at <= ?",date ,date.end_of_year])
diff --git a/app/controllers/public/orders_controller.rb b/app/controllers/public/orders_controller.rb
index d079c20..565f0f0 100644
--- a/app/controllers/public/orders_controller.rb
+++ b/app/controllers/public/orders_controller.rb
@@ -12,7 +12,7 @@ class Public::OrdersController < ApplicationController
def create
@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
respond_to do |format|
format.html { redirect_to paid_by_paypal_public_order_path(@order.token)}
diff --git a/app/models/renew.rb b/app/models/renew.rb
index 2f06110..2827f4b 100644
--- a/app/models/renew.rb
+++ b/app/models/renew.rb
@@ -39,7 +39,7 @@ class Renew < ActiveRecord::Base
end
- YEAR = 2020
+ YEAR = 2021
def done_return
if self.ok and !self.return_done
diff --git a/app/views/admin/sheets/index.xls.erb b/app/views/admin/sheets/index.xls.erb
index 6ce95bc..f294e51 100644
--- a/app/views/admin/sheets/index.xls.erb
+++ b/app/views/admin/sheets/index.xls.erb
@@ -27,9 +27,9 @@
| Dernier renouvellement |
Création de la fiche |
mise à jour |
- Paiement pour 2019 |
- Type d'adhésion pour 2019 |
- Pouvoirs pour 2019 |
+ Paiement pour 2020 |
+ Type d'adhésion pour 2020 |
+ Pouvoirs pour 2020 |
@@ -68,8 +68,8 @@
<%= sheet.last_year %> |
<%= l sheet.created_at %> |
<%= l sheet.updated_at %> |
- <% if sheet.sheet_years.where(:year => 2019).first %>
- <% sy = sheet.sheet_years.where(:year => 2019).first %>
+ <% if sheet.sheet_years.where(:year => 2020).first %>
+ <% sy = sheet.sheet_years.where(:year => 2020).first %>
<%= l(sy.paid_at) if sy.paid_at %> |
<%= SheetYear::JOIN_TYPE[sy.join_type] %> |
diff --git a/app/views/admin/sheets/recus.html.haml b/app/views/admin/sheets/recus.html.haml
index 9e7e3bb..52d9279 100644
--- a/app/views/admin/sheets/recus.html.haml
+++ b/app/views/admin/sheets/recus.html.haml
@@ -1,6 +1,6 @@
-price_list = {}
--i = 9
+-i = 4
-@sheet_years.each do |sheet_year|
-price_list[sheet_year.amount.to_s] = true
-i += 1