This commit is contained in:
Nicolas Bally 2020-05-25 13:52:19 +02:00
parent c0c6c94896
commit 0abc155b81
6 changed files with 64 additions and 45 deletions

View File

@ -196,6 +196,7 @@
%tr
%td
-if price_line.location_template
Forfait
="#{price_line.qte}J location"
=price_line.title
@ -227,6 +228,8 @@
Caution : chèque de
=number_to_currency price_line.caution
non encaissé
-else
=price_line.title
%td.numeraire
@ -237,6 +240,7 @@
%tr
%td
-if price_line_block.covid
%br
%br
%br

View File

@ -44,6 +44,7 @@
= f.input :customer_ref, :label => "Référence commande client :"
= f.input :covid, :label => "Mention covid ?"
.price_lines_form

View File

@ -134,6 +134,8 @@
%table.form-table{:style => "width:100%;margin-top:5px;"}
%tr
%td{:style => "width:30px"}
%td
= form.input :location_template, :label => "Location ?"
%td
= form.input :start_at, :label => "Date de début de location :", :as => :date
%td

View File

@ -0,0 +1,5 @@
class AddCovidToPriceLineBlocks < ActiveRecord::Migration[6.0]
def change
add_column :price_line_blocks, :covid, :boolean, :default => true
end
end

View File

@ -0,0 +1,5 @@
class AddLocationTemplateToPriceLines < ActiveRecord::Migration[6.0]
def change
add_column :price_lines, :location_template, :boolean, :default => true
end
end

View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2020_04_12_143258) do
ActiveRecord::Schema.define(version: 2020_05_25_113631) do
create_table "accounting_zones", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|
t.string "name"
@ -1953,6 +1953,7 @@ ActiveRecord::Schema.define(version: 2020_04_12_143258) do
t.boolean "cc_remise_qte_ok"
t.integer "p_fournisseur_id"
t.date "ct_payment_end_at"
t.boolean "covid", default: true
t.index ["p_customer_id"], name: "index_price_line_blocks_on_p_customer_id"
end
@ -2112,6 +2113,7 @@ ActiveRecord::Schema.define(version: 2020_04_12_143258) do
t.datetime "end_at"
t.datetime "ship_at"
t.datetime "return_at"
t.boolean "location_template", default: true
end
create_table "quote_contents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", force: :cascade do |t|