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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2020-06-24 19:19:47 +02:00
parent fbc7f4206d
commit 1482ece3d7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/m_odr_file.rb
View File

@ -7,10 +7,10 @@ class MOdrFile < ApplicationRecord
has_many :mail_hists
has_many :m_odr_file_products
has_many :m_odr_file_products, :dependent => :destroy
accepts_nested_attributes_for :m_odr_file_products, :allow_destroy => true
has_many :m_odr_file_roulages
has_many :m_odr_file_roulages, :dependent => :destroy
accepts_nested_attributes_for :m_odr_file_roulages, :allow_destroy => true
@ -113,7 +113,7 @@ class MOdrFile < ApplicationRecord
:nbr_pneus_not_useds => {:name => "Nbr pneus restants", :reorder => true},
:nbr_primes => {:name => "Nbr primes", :reorder => true},
:nbr_primes_useds => {:name => "Nbr primes utilisés", :reorder => true},
:nbr_primes_not_useds => {:name => "Nbr primes restants", :reorder => true},
:nbr_primes_not_useds => {:name => "Nbr primes restantes", :reorder => true},
:actions => {:name => "Actions", :reorder => true},

2
app/views/admin/m_odr_files/_m_odr_file.html.haml
View File

@ -35,7 +35,7 @@
-tr[:actions] = capture do
%td.actions
= link_to i(:"trash-o"), [:admin, m_odr_file], method: :delete, data: { confirm: 'Voulez-vous vraiment supprimer cet enregistrement ? ' } , :remote => false
= link_to i(:"trash-o"), [:admin, m_odr_file], method: :delete, data: { confirm: 'Voulez-vous vraiment supprimer cet enregistrement ? ' } , :remote => true
= link_to i(:pencil), edit_admin_m_odr_file_path(m_odr_file), :remote => false
= link_to i(:eye), admin_m_odr_file_path(m_odr_file), :remote => false

4
app/views/admin/m_odr_files/show.html.haml
View File

@ -48,11 +48,11 @@
-@m_odr_file.m_odr_file_products.each do |m_odr_file_product|
%tr
%td
=m_odr_file_product.m_odr_product_size.name
=m_odr_file_product.m_odr_product_size.name if m_odr_file_product.m_odr_product_size
%td
=m_odr_file_product.qte
%td
=number_to_currency m_odr_file_product.price
=number_to_currency m_odr_file_product.price if m_odr_file_product.m_odr_product_size
-else