From 02e96436c5e7e1bb141c91811ad6a4fb5542e76e Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 24 Jun 2020 18:57:48 +0200 Subject: [PATCH] suite --- .../public/m_odr_files/_m_odr_file.html.haml | 26 +++++++++---------- app/views/public/my_account/index.html.haml | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/views/public/m_odr_files/_m_odr_file.html.haml b/app/views/public/m_odr_files/_m_odr_file.html.haml index 9f1af2b..3b18d99 100644 --- a/app/views/public/m_odr_files/_m_odr_file.html.haml +++ b/app/views/public/m_odr_files/_m_odr_file.html.haml @@ -1,17 +1,17 @@ - -%tr#m_odr_file_row{:id => m_odr_file.id} +-m_odr_file.m_odr_file_roulages.each do |m_odr_file_roulage| + %tr#m_odr_file_row{:id => m_odr_file.id} - %td - =l m_odr_file.created_at, :format => :date + %td + =l m_odr_file_roulage.date, :format => :date if m_odr_file_roulage.date - %td - =link_to ic(:download)+" Télécharger le document", download_admin_m_odr_file_path(m_odr_file, :disposition => "attachment") + %td + =link_to ic(:download)+" Télécharger le document", download_admin_m_odr_file_path(m_odr_file, :disposition => "attachment") - %td.state - -if m_odr_file.admin_ok - =state_helper("Validé") - -elsif m_odr_file.admin_ok == false - =state_helper("Refusé") - -else - =state_helper("En cours de vérification") \ No newline at end of file + %td.state + -if m_odr_file.admin_ok + =state_helper("Validé") + -elsif m_odr_file.admin_ok == false + =state_helper("Refusé") + -else + =state_helper("En cours de vérification") \ No newline at end of file diff --git a/app/views/public/my_account/index.html.haml b/app/views/public/my_account/index.html.haml index cecd478..e45a51c 100644 --- a/app/views/public/my_account/index.html.haml +++ b/app/views/public/my_account/index.html.haml @@ -159,7 +159,7 @@ = link_to 'Envoyer une facture de pneus', new_public_m_odr_file_path(:m_odr_file_type_id => 2), :class => "new_btn" %br %br - %h3 Mes factures de roulage + %h3 Mes journées de roulages -if m_odr_files = current_p_customer.m_odr_files.where(:m_odr_file_type_id => 1) and m_odr_files.count > 0 %table.table =render m_odr_files