diff --git a/app/models/p_product_ref.rb b/app/models/p_product_ref.rb index 9ff80d1..9a7fccf 100644 --- a/app/models/p_product_ref.rb +++ b/app/models/p_product_ref.rb @@ -43,12 +43,14 @@ class PProductRef < ApplicationRecord :description => {:name => "Description"}, :ct_sub_name => {:name => "Nom référence"}, :ct_price_ht => {:name => "Prix de vente", :as => :currency}, - - + :ean => {:name => "EAN"}, + :ca_deee => {:name => "DEEE", :as => :currency}, + :ca_sorecop => {:name => "Sorecop", :as => :currency}, + :sorecop_comment => {:name => "Type de Sorecop"}, :actions => {:name => "Actions", :reorder => false} } - acts_as_caching :fields => [:sorecop, :dee] + acts_as_caching :fields => [:sorecop, :deee] def not_imported? if !self.p_product or !self.p_product.imported @@ -159,11 +161,11 @@ class PProductRef < ApplicationRecord end end - def ca_dee - if self.cc_dee - return self.cc_dee + def ca_deee + if self.cc_deee + return self.cc_deee else - "TODO Calcul DEE" + "TODO Calcul DEEE" end end diff --git a/app/views/admin/p_product_refs/_form.html.haml b/app/views/admin/p_product_refs/_form.html.haml index b7ff800..4b0b755 100644 --- a/app/views/admin/p_product_refs/_form.html.haml +++ b/app/views/admin/p_product_refs/_form.html.haml @@ -1,3 +1,4 @@ +=#debug form.object.errors.messages =# form.input :ref, :label => "Ref :" .qi_row.field .qi_pannel.qi_plain.padding @@ -19,6 +20,15 @@ %td =form.input :p_product_color_id, :label => "Couleur :", :collection => PProductColor.all, :as => :select, :include_blank => true + %td + =form.input :ct_sorecop, :label => "Sorecop personalisée :" + %td + =form.input :sorecop_comment, :label => "Type de Sorecop :" + %td + =form.input :ct_deee, :label => "DEEE personalisée :" + %td + =form.input :ean + diff --git a/db/migrate/20210917121011_add_dee_to_p_product_refs.rb b/db/migrate/20210917121011_add_dee_to_p_product_refs.rb deleted file mode 100644 index ddf1f70..0000000 --- a/db/migrate/20210917121011_add_dee_to_p_product_refs.rb +++ /dev/null @@ -1,7 +0,0 @@ -class AddDeeToPProductRefs < ActiveRecord::Migration[6.0] - def change - add_column :p_product_refs, :ca_dee, :decimal, :precision => 10, :scale => 2 - add_column :p_product_refs, :cc_dee, :decimal, :precision => 10, :scale => 2 - add_column :p_product_refs, :ct_dee, :decimal, :precision => 10, :scale => 2 - end -end diff --git a/db/migrate/20210917121011_add_deee_to_p_product_refs.rb b/db/migrate/20210917121011_add_deee_to_p_product_refs.rb new file mode 100644 index 0000000..9542490 --- /dev/null +++ b/db/migrate/20210917121011_add_deee_to_p_product_refs.rb @@ -0,0 +1,7 @@ +class AddDeeeToPProductRefs < ActiveRecord::Migration[6.0] + def change + add_column :p_product_refs, :ca_deee, :decimal, :precision => 10, :scale => 2 + add_column :p_product_refs, :cc_deee, :decimal, :precision => 10, :scale => 2 + add_column :p_product_refs, :ct_deee, :decimal, :precision => 10, :scale => 2 + end +end diff --git a/db/schema.rb b/db/schema.rb index 81e123a..5baae52 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1796,9 +1796,9 @@ ActiveRecord::Schema.define(version: 2021_09_17_124338) do t.decimal "ca_sorecop", precision: 10, scale: 2 t.decimal "cc_sorecop", precision: 10, scale: 2 t.decimal "ct_sorecop", precision: 10, scale: 2 - t.decimal "ca_dee", precision: 10, scale: 2 - t.decimal "cc_dee", precision: 10, scale: 2 - t.decimal "ct_dee", precision: 10, scale: 2 + t.decimal "ca_deee", precision: 10, scale: 2 + t.decimal "cc_deee", precision: 10, scale: 2 + t.decimal "ct_deee", precision: 10, scale: 2 t.string "ean" t.string "sorecop_comment" end