From 0d82e514cd6800c9759a0db15f6ccbe5f3a01385 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@Heribook.local>
Date: Wed, 1 Apr 2020 15:37:03 +0200
Subject: [PATCH] suite

---
 app/controllers/admin/m_odr_reps_controller.rb  | 5 +++--
 app/models/m_odr_rep.rb                         | 9 +++++++--
 app/views/admin/m_odr_reps/_m_odr_rep.html.haml | 6 +++---
 app/views/admin/m_odr_reps/index.html.haml      | 1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/controllers/admin/m_odr_reps_controller.rb b/app/controllers/admin/m_odr_reps_controller.rb
index 9de5874..290799c 100644
--- a/app/controllers/admin/m_odr_reps_controller.rb
+++ b/app/controllers/admin/m_odr_reps_controller.rb
@@ -11,8 +11,9 @@ class Admin::MOdrRepsController < ApplicationController
   end
   
   def index
-    @m_odr_reps = MOdrRep.includes(:particulars)
+    @m_odr_reps = MOdrRep.includes(:particulars).includes(:m_odr)
     
+    @can_update = current_admin.has_permission?("odr_rep.update")
     
     if !current_admin.has_permission?("odr_rep.view")
       @m_odr_reps = @m_odr_reps.joins(:m_odr).where(:m_odrs => {:p_customer_id => current_admin.p_customers.ids})
@@ -30,7 +31,7 @@ class Admin::MOdrRepsController < ApplicationController
     end
     
     #puts @m_odr_reps.klass
-    @m_odr_reps = sort_by_sorting(@m_odr_reps, "created_at DESC")
+    @m_odr_reps = sort_by_sorting(@m_odr_reps, "m_odr_reps.created_at DESC")
     
     
     params[:search][:per_page] = params[:search][:per_page] || 50
diff --git a/app/models/m_odr_rep.rb b/app/models/m_odr_rep.rb
index d64191f..c7686e0 100644
--- a/app/models/m_odr_rep.rb
+++ b/app/models/m_odr_rep.rb
@@ -201,7 +201,7 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa
   def self.qi_table_order
     {
       :m_odr => "ODR",
-      :created_at => {:name => "Date", :reorder => true},
+      :created_at => {:name => "Date", :reorder => true, :sort_name => "m_odr_reps.created_at"},
       :state => {:name => "Etat", :reorder => true},
       :cc_rib_admin_ok => {:name => "Rib valide ?", :reorder => true},
       :cc_file_admin_ok => {:name => "Fichiers valides ?", :reorder => true},
@@ -276,7 +276,12 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa
     self.qi_table_order.each do |key, value|
       if value.instance_of? Hash
         if value[:reorder] and value[:reorder] == true
-          r << key.to_s if value[:reorder]
+          if value[:sort_name] 
+           
+            r << value[:sort_name] if value[:sort_name]
+          else
+            r << key.to_s if value[:reorder]
+          end
         end
       end
     end
diff --git a/app/views/admin/m_odr_reps/_m_odr_rep.html.haml b/app/views/admin/m_odr_reps/_m_odr_rep.html.haml
index 1b26cfe..e3753e9 100644
--- a/app/views/admin/m_odr_reps/_m_odr_rep.html.haml
+++ b/app/views/admin/m_odr_reps/_m_odr_rep.html.haml
@@ -8,7 +8,7 @@
     %td=m_odr_rep.m_odr.name if m_odr_rep.m_odr
     
   -tr[:cc_remise] = capture do
-    %td=number_to_currency m_odr_rep.remise
+    %td=number_to_currency m_odr_rep.cc_remise
   
   -tr[:cc_rib_admin_ok] = capture do
     %td= "oui" if m_odr_rep.rib_admin_ok 
@@ -21,9 +21,9 @@
   
   -tr[:actions] = capture do
     %td.actions
-      -if current_admin.has_permission?("odr_rep.delete")
+
+      -if @can_update
         = link_to i(:"trash-o"), [:admin, m_odr_rep], method: :delete, data: { confirm: 'Voulez-vous vraiment supprimer cet enregistrement ? ' } , :remote => true
-      -if current_admin.has_permission?("odr_rep.update")
         = link_to i(:pencil), edit_admin_m_odr_rep_path(m_odr_rep), :remote => true
         = link_to i(:eye), admin_m_odr_rep_path(m_odr_rep)
 
diff --git a/app/views/admin/m_odr_reps/index.html.haml b/app/views/admin/m_odr_reps/index.html.haml
index d4fde13..174514c 100644
--- a/app/views/admin/m_odr_reps/index.html.haml
+++ b/app/views/admin/m_odr_reps/index.html.haml
@@ -9,6 +9,7 @@
 -MOdrRep.all.each do |m_odr_rep|
   -m_odr_rep.save
 
+
 .qi_search_row
   =form_tag "", :method => "get",  :onsubmit => "" do
     -params[:search] =params[:search] || {}