From 63a33650a9e52fda849ac2af7279c890a085fff2 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 22 Apr 2020 23:23:56 +0200 Subject: [PATCH] suite --- app/models/m_odr_rep.rb | 3 +++ app/views/admin/m_odr_reps/_m_odr_rep.html.haml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/models/m_odr_rep.rb b/app/models/m_odr_rep.rb index 723b518..86f4c44 100644 --- a/app/models/m_odr_rep.rb +++ b/app/models/m_odr_rep.rb @@ -37,6 +37,7 @@ class MOdrRep < ApplicationRecord belongs_to :m_odr_tracker + belongs_to :m_odr_product_cat def reduc_code_needed? @@ -281,6 +282,8 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa :cc_tracker_name => {:name => "Trackeur", :reorder => true}, + + :m_odr_product_cat => {:name => "Type"}, diff --git a/app/views/admin/m_odr_reps/_m_odr_rep.html.haml b/app/views/admin/m_odr_reps/_m_odr_rep.html.haml index e3753e9..659ce17 100644 --- a/app/views/admin/m_odr_reps/_m_odr_rep.html.haml +++ b/app/views/admin/m_odr_reps/_m_odr_rep.html.haml @@ -18,6 +18,10 @@ -tr[:cc_admin_ok_to_send] = capture do %td= "oui" if m_odr_rep.admin_ok_to_send + + -tr[:m_odr_product_cat] = capture do + %td= m_odr_rep.m_odr_product_cat.name if m_odr_rep.m_odr_product_cat + -tr[:actions] = capture do %td.actions