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

missing e in DEEE

Browse Source
This commit is contained in:
Barnabé 2021-09-17 16:48:14 +02:00
parent 56dc686008
commit 39fe54bdad
5 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/p_product_ref.rb
View File

@ -43,12 +43,14 @@ class PProductRef < ApplicationRecord
:description => {:name => "Description"}, :description => {:name => "Description"},
:ct_sub_name => {:name => "Nom référence"}, :ct_sub_name => {:name => "Nom référence"},
:ct_price_ht => {:name => "Prix de vente", :as => :currency}, :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} :actions => {:name => "Actions", :reorder => false}
} }
acts_as_caching :fields => [:sorecop, :dee] acts_as_caching :fields => [:sorecop, :deee]
def not_imported? def not_imported?
if !self.p_product or !self.p_product.imported if !self.p_product or !self.p_product.imported
@ -159,11 +161,11 @@ class PProductRef < ApplicationRecord
end end
end end
def ca_dee def ca_deee
if self.cc_dee if self.cc_deee
return self.cc_dee return self.cc_deee
else else
"TODO Calcul DEE" "TODO Calcul DEEE"
end end
end end

10
app/views/admin/p_product_refs/_form.html.haml
View File

@ -1,3 +1,4 @@
=#debug form.object.errors.messages
=# form.input :ref, :label => "Ref :" =# form.input :ref, :label => "Ref :"
.qi_row.field .qi_row.field
.qi_pannel.qi_plain.padding .qi_pannel.qi_plain.padding
@ -19,6 +20,15 @@
%td %td
=form.input :p_product_color_id, :label => "Couleur :", :collection => PProductColor.all, :as => :select, :include_blank => true =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

7
db/migrate/20210917121011_add_dee_to_p_product_refs.rb
View File

@ -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

7
db/migrate/20210917121011_add_deee_to_p_product_refs.rb Normal file
View File

@ -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

6
db/schema.rb
View File

@ -1796,9 +1796,9 @@ ActiveRecord::Schema.define(version: 2021_09_17_124338) do
t.decimal "ca_sorecop", precision: 10, scale: 2 t.decimal "ca_sorecop", precision: 10, scale: 2
t.decimal "cc_sorecop", precision: 10, scale: 2 t.decimal "cc_sorecop", precision: 10, scale: 2
t.decimal "ct_sorecop", precision: 10, scale: 2 t.decimal "ct_sorecop", precision: 10, scale: 2
t.decimal "ca_dee", precision: 10, scale: 2 t.decimal "ca_deee", precision: 10, scale: 2
t.decimal "cc_dee", precision: 10, scale: 2 t.decimal "cc_deee", precision: 10, scale: 2
t.decimal "ct_dee", precision: 10, scale: 2 t.decimal "ct_deee", precision: 10, scale: 2
t.string "ean" t.string "ean"
t.string "sorecop_comment" t.string "sorecop_comment"
end end