From 5a3eb40c61556838fe1c90c4ba5915c3f1f3f0f2 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Heribook.local>
Date: Wed, 15 Jul 2020 15:36:45 +0200
Subject: [PATCH] suite

---
 .../admin/m_odr_files_controller.rb           |  6 +++++-
 .../public/m_odr_rep_ribs_controller.rb       |  3 +++
 app/views/admin/m_odr_files/show.html.haml    | 14 +++++++++++++
 app/views/public/my_account/index.html.haml   | 20 +++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/m_odr_files_controller.rb b/app/controllers/admin/m_odr_files_controller.rb
index 212fec7..7ee34b3 100644
--- a/app/controllers/admin/m_odr_files_controller.rb
+++ b/app/controllers/admin/m_odr_files_controller.rb
@@ -34,7 +34,11 @@ class Admin::MOdrFilesController < ApplicationController
 
   def new
     @m_odr_file = MOdrFile.new(:m_odr_file_type_id => params[:m_odr_file_type_id], :p_customer_id => params[:p_customer_id])
-  
+    if params[:m_odr_file_type_id] == "1"
+      @m_odr_file.m_odr_file_roulages.build
+    else
+      @m_odr_file.m_odr_file_products.build
+    end
   end
 
   def edit
diff --git a/app/controllers/public/m_odr_rep_ribs_controller.rb b/app/controllers/public/m_odr_rep_ribs_controller.rb
index 0e93d2d..d7ba385 100644
--- a/app/controllers/public/m_odr_rep_ribs_controller.rb
+++ b/app/controllers/public/m_odr_rep_ribs_controller.rb
@@ -55,6 +55,9 @@ class Public::MOdrRepRibsController < ApplicationController
     @m_odr_rep = @m_odr_rep_rib.m_odr_rep
 
     if @m_odr_rep_rib.update_attributes(params.require(:m_odr_rep_rib).permit!)
+      @m_odr_rep_rib.admin_ok = nil
+      
+      @m_odr_rep_rib.save
       redirect_to public_my_account_path, :notice => "Votre RIB a bien été modifié"
     else
      render action: "edit" 
diff --git a/app/views/admin/m_odr_files/show.html.haml b/app/views/admin/m_odr_files/show.html.haml
index 6d298a2..5b54803 100644
--- a/app/views/admin/m_odr_files/show.html.haml
+++ b/app/views/admin/m_odr_files/show.html.haml
@@ -113,3 +113,17 @@ Historique des mails envoyés
 -@mail_hists = @mail_hists.page(page).per(per_page)
 
 =render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @mail_hists}
+
+
+.clear
+%hr
+Historique des mails envoyés
+
+-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_files = @m_odr_file.p_customer.m_odr_files.where("id != ?", @m_odr_file.id).where(:m_odr_file_type_id => @m_odr_file.m_odr_file_type_id )
+-@m_odr_files = sort_by_sorting(@m_odr_files, "created_at DESC")
+-@m_odr_files = @m_odr_files.page(page).per(per_page)
+
+=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @m_odr_files}
diff --git a/app/views/public/my_account/index.html.haml b/app/views/public/my_account/index.html.haml
index e45a51c..5f007cc 100644
--- a/app/views/public/my_account/index.html.haml
+++ b/app/views/public/my_account/index.html.haml
@@ -83,6 +83,26 @@
                 %br
                 = link_to "Modifier mon rib", edit_public_m_odr_rep_rib_path(current_p_customer.m_odr_rep_ribs.first)
         
+            
+            
+            -elsif current_p_customer.m_odr_rep_ribs.count > 0 and current_p_customer.m_odr_rep_ribs.first.admin_ok == false
+              %p
+                %span.red
+                  =ic :flag
+                RIB non valide
+          
+              -rib = current_p_customer.m_odr_rep_ribs.first
+        
+              .rib
+                IBAN : 
+                =rib.iban.to_s.gsub(/(.{4})(?=.)/, '\1 \2')
+                %br
+                BIC : 
+                =rib.bic
+                %br
+                = link_to "Modifier mon rib", edit_public_m_odr_rep_rib_path(current_p_customer.m_odr_rep_ribs.first)
+            
+            
             -elsif current_p_customer.m_odr_rep_ribs.count > 0
               %p
                 %span.orange