From 947d5d84399224e9626efdd682874e74a1d97b3b Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 25 May 2020 11:59:10 +0200 Subject: [PATCH] =?UTF-8?q?ajout=20code=20r=C3=A9duction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/m_odr_reps_controller.rb | 4 ++++ app/models/m_odr_rep.rb | 2 ++ app/views/admin/m_odr_reps/index.html.haml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/app/controllers/admin/m_odr_reps_controller.rb b/app/controllers/admin/m_odr_reps_controller.rb index e637bae..17cb876 100644 --- a/app/controllers/admin/m_odr_reps_controller.rb +++ b/app/controllers/admin/m_odr_reps_controller.rb @@ -23,6 +23,10 @@ class Admin::MOdrRepsController < ApplicationController if params[:name].to_s != "" @m_odr_reps = @m_odr_reps.where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ?","%#{params[:name]}%", "%#{params[:name]}%") end + + if params[:reduc_code].to_s != "" + @m_odr_reps = @m_odr_reps.where("reduc_code LIKE ?","%#{params[:reduc_code]}%") + end if params[:search][:state].to_s != "" @m_odr_reps = @m_odr_reps.where(:state => params[:search][:state]) diff --git a/app/models/m_odr_rep.rb b/app/models/m_odr_rep.rb index 86f4c44..ffd6bc8 100644 --- a/app/models/m_odr_rep.rb +++ b/app/models/m_odr_rep.rb @@ -278,6 +278,8 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa :cc_place_name => {:name => "Revendeur", :reorder => true}, + :reduc_code => {:name => "Code réduction", :reorder => true}, + diff --git a/app/views/admin/m_odr_reps/index.html.haml b/app/views/admin/m_odr_reps/index.html.haml index 87582fe..3d17535 100644 --- a/app/views/admin/m_odr_reps/index.html.haml +++ b/app/views/admin/m_odr_reps/index.html.haml @@ -35,6 +35,8 @@ %td=text_field_tag :name, params[:name],:class => "form-control", :placeholder => "Nom" + %td=text_field_tag :reduc_code, params[:reduc_code],:class => "form-control", :placeholder => "Code réduction" + =render :partial => "qi/qi_ordered_table_search_footer", :locals => {:collection_object => @m_odr_reps}