From 07c5cddb75fc1b7691854d594d53c85973b32a4b Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Sat, 29 Feb 2020 15:21:45 +0100 Subject: [PATCH] suite --- app/views/public/m_odr_reps/thank.html.haml | 2 +- app/views/public/m_odrs/show.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/public/m_odr_reps/thank.html.haml b/app/views/public/m_odr_reps/thank.html.haml index 7ee6c5c..b24ad8b 100644 --- a/app/views/public/m_odr_reps/thank.html.haml +++ b/app/views/public/m_odr_reps/thank.html.haml @@ -11,7 +11,7 @@ Merci ! -if @m_odr.thank_text? - =@m_odr.thank_text + =simple_format @m_odr.thank_text -else %p Merci pour votre participation diff --git a/app/views/public/m_odrs/show.html.haml b/app/views/public/m_odrs/show.html.haml index d34f0f5..756ceca 100644 --- a/app/views/public/m_odrs/show.html.haml +++ b/app/views/public/m_odrs/show.html.haml @@ -118,10 +118,10 @@ %h3 Votre achat =f.inputs do - =f.input :qte, :label => "Pneu :", :as => :select, :collection => f.object.m_odr.m_odr_products.order("m_odr_brand_id ASC, m_odr_products.name"), :member_label => :member_label, :include_blank => true + =f.input :m_odr_product_id, :label => "Pneu :", :as => :select, :collection => f.object.m_odr.m_odr_products.order("m_odr_brand_id ASC, m_odr_products.name"), :member_label => :member_label, :include_blank => true =f.inputs do - =f.input :m_odr_product_id, :label => "Nombre de pneus :", :as => :select, :collection => [1,2], :include_blank => true + =f.input :qte, :label => "Nombre de pneus :", :as => :select, :collection => [1,2], :include_blank => true =f.inputs do =f.input :m_odr_place, :label => "Point de vente :", :as => :select, :collection => f.object.m_odr.m_odr_places.order(:name), :include_blank => true