diff --git a/app/models/m_odr_place.rb b/app/models/m_odr_place.rb index dc42f40..1a641a0 100644 --- a/app/models/m_odr_place.rb +++ b/app/models/m_odr_place.rb @@ -16,7 +16,7 @@ class MOdrPlace < ApplicationRecord def member_label - self.name+" - "+self.city.to_s + self.enseigne.to_s+" - "+self.name.to_s+" - "+self.city.to_s end diff --git a/app/views/admin/m_odr_files/_form.html.haml b/app/views/admin/m_odr_files/_form.html.haml index 5952852..0940e32 100644 --- a/app/views/admin/m_odr_files/_form.html.haml +++ b/app/views/admin/m_odr_files/_form.html.haml @@ -20,7 +20,7 @@ -if f.object.m_odr_file_type_id == 2 %table.m_odr_file_products_form.form-table = f.input :buy_at, :label => "Date de l'achat", :as => :date - = f.input :m_odr_place, :label => "Revendeur :", :as => :date, :collection => MOdrPlace.order("name ASC, city ASC").all, :member_label => :member_label, :as => :select + = f.input :m_odr_place, :label => "Revendeur :", :as => :date, :collection => MOdrPlace.order("enseigne ASC, name ASC, city ASC").all, :member_label => :member_label, :as => :select =f.semantic_fields_for :m_odr_file_products do |form| =render :partial => "admin/m_odr_file_products/form", :locals => {:form => form} diff --git a/app/views/admin/m_odr_places/_form.html.haml b/app/views/admin/m_odr_places/_form.html.haml index a0e1c03..3311bae 100644 --- a/app/views/admin/m_odr_places/_form.html.haml +++ b/app/views/admin/m_odr_places/_form.html.haml @@ -2,7 +2,12 @@ .content =f.inputs do + + = f.input :enseigne, :label => "Enseigne :" = f.input :name, :label => "Nom :" + = f.input :address2, :label => "Adresse :" + = f.input :cp, :label => "Code postal :" + = f.input :city, :label => "Ville :"