From 0672c2ef1ecc81b0c99d9da75d0d1951e7585cd9 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Heribook.local>
Date: Thu, 30 Jul 2020 16:31:19 +0200
Subject: [PATCH] suite

---
 app/models/m_odr_rep.rb                           | 1 +
 app/views/admin/m_odr_reps/_form.html.haml        | 2 ++
 app/views/admin/m_odr_reps/_left_column.html.haml | 6 ++++++
 app/views/admin/m_odr_reps/show.html.haml         | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/m_odr_rep.rb b/app/models/m_odr_rep.rb
index bcd8b63..2f666e4 100644
--- a/app/models/m_odr_rep.rb
+++ b/app/models/m_odr_rep.rb
@@ -178,6 +178,7 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa
 
     end
 
+    self.reduc_code = self.reduc_code.upcase
 
     if self.m_odr.reduc_code_needed and self.m_odr.m_odr_coupons.count > 0 and !self.m_odr.m_odr_coupons.where("name LIKE ?", self.reduc_code).first
       
diff --git a/app/views/admin/m_odr_reps/_form.html.haml b/app/views/admin/m_odr_reps/_form.html.haml
index 0a14dd8..b06cb43 100644
--- a/app/views/admin/m_odr_reps/_form.html.haml
+++ b/app/views/admin/m_odr_reps/_form.html.haml
@@ -21,6 +21,8 @@
       =f.input :m_odr_place, :label => "Point de vente :", :as => :select, :collection => f.object.m_odr.m_odr_places.order(:name), :include_blank => true
       
       =f.input :reduc, :label => "Remise manuelle :"
+      
+      =f.input :reduc_code, :label => "Code de réduction :"
     
     
       
diff --git a/app/views/admin/m_odr_reps/_left_column.html.haml b/app/views/admin/m_odr_reps/_left_column.html.haml
index 624d07f..e430090 100644
--- a/app/views/admin/m_odr_reps/_left_column.html.haml
+++ b/app/views/admin/m_odr_reps/_left_column.html.haml
@@ -25,6 +25,12 @@
     %td Date d'achat
     %td
       =l @m_odr_rep.buy_at if @m_odr_rep.buy_at
+      
+  
+  %tr
+    %td Code de réduction
+    %td
+      =@m_odr_rep.reduc_code
 
 
 
diff --git a/app/views/admin/m_odr_reps/show.html.haml b/app/views/admin/m_odr_reps/show.html.haml
index 1f66bc9..5c15767 100644
--- a/app/views/admin/m_odr_reps/show.html.haml
+++ b/app/views/admin/m_odr_reps/show.html.haml
@@ -16,7 +16,7 @@
 -params[:search][:per_page] = params[:search][:per_page] || 50
 -per_page = params[:search][:per_page]
 -page = (params[:page] and params[:page] != "") ? params[:page] : 1 
--m_odr_reps = MOdrRep.where(:m_odr_id => @m_odr_rep.m_odr_id).where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_email LIKE ? or cc_particular_address_2 LIKE ?","%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_email}%", "%#{@m_odr_rep.cc_particular_address_2}%").where("id != ?",@m_odr_rep.id)
+-m_odr_reps = MOdrRep.where(:m_odr_id => @m_odr_rep.m_odr_id).where("cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_name LIKE ? or cc_particular_firstname LIKE ? or cc_particular_email LIKE ? or cc_particular_address_2 LIKE ? or reduc_code LIKE ?","%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_firstname}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_name}%", "%#{@m_odr_rep.cc_particular_email}%", "%#{@m_odr_rep.cc_particular_address_2}%", "%#{@m_odr_rep.reduc_code}%").where("id != ?",@m_odr_rep.id)
 -m_odr_reps = sort_by_sorting(m_odr_reps, "created_at DESC")
 -m_odr_reps = m_odr_reps.page(page).per(per_page)