From 04cad83a5c84c3d3a524328bfaf3c3dc223a627d Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 1 Apr 2020 23:58:34 +0200 Subject: [PATCH] suite --- app/models/m_odr_virement.rb | 6 +++--- .../admin/m_odr_virements/_m_odr_virement.html.haml | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/models/m_odr_virement.rb b/app/models/m_odr_virement.rb index 4363840..1db1698 100644 --- a/app/models/m_odr_virement.rb +++ b/app/models/m_odr_virement.rb @@ -39,11 +39,11 @@ class MOdrVirement < ApplicationRecord - :enabled => {:name => "Vérifié ?", :reorder => true}, + :enabled => {:name => "Ok pour remise ?", :reorder => true}, - :sended => {:name => "Envoyé ?", :reorder => true}, + :sended => {:name => "Validé par la banque ?", :reorder => true}, - :refused => {:name => "Refusé ?", :reorder => true}, + :refused => {:name => "Refusé par la banque?", :reorder => true}, :actions => "Actions", diff --git a/app/views/admin/m_odr_virements/_m_odr_virement.html.haml b/app/views/admin/m_odr_virements/_m_odr_virement.html.haml index ceae83e..a115ee8 100644 --- a/app/views/admin/m_odr_virements/_m_odr_virement.html.haml +++ b/app/views/admin/m_odr_virements/_m_odr_virement.html.haml @@ -2,9 +2,15 @@ -tr = {} -tr[:m_odr_rep_link] = capture do - %td=link_to "##{m_odr_virement.m_odr_rep.id}", [:admin, m_odr_virement.m_odr_rep] if m_odr_virement.m_odr_rep - - + %td + -if m_odr_virement.m_odr_rep + =link_to [:admin, m_odr_virement.m_odr_rep] do + ="##{m_odr_virement.m_odr_rep_id} -" + = m_odr_virement.m_odr_rep.cc_particular_civilite + = m_odr_virement.m_odr_rep.cc_particular_name + = m_odr_virement.m_odr_rep.cc_particular_firstname + + -tr[:amount] = capture do %td=number_to_currency m_odr_virement.amount