mise à jour droits vulco

app/controllers/admin/m_odr_reps_controller.rb

@@ -207,11 +207,19 @@ class Admin::MOdrRepsController < ApplicationController
   def send_state
     @m_odr_rep = MOdrRep.find(params[:id])
     
-    
     @m_odr_rep.change_state("Envoyée")
     
+    @m_odr_rep.send_mail_type("succes")
+    
+    respond_to do |format|
+      format.html{
+        redirect_to [:admin, @m_odr_rep]
+      }
+      format.js{
+        
+      }
+    end
     
-    redirect_to [:admin, @m_odr_rep]
   end
     
   def send_mail

app/models/m_odr_rep.rb

@@ -97,7 +97,7 @@ class MOdrRep < ApplicationRecord
   def send_mail_type(slug, element = nil)
 
     if self.m_odr and mail_type = self.m_odr.mail_types.where(:slug => slug).first and self.particulars.first and self.particulars.first.email?
-      mail_hist = MailHist.generate_mail(:fr, mail_type, self.particulars.first.email, {:arguments => {:bon_achat => ("<center><img src='#{self.ba_url}' style='display:block;margin;auto;' /></center>" if self.m_odr.ba_generation),:nom_odr => self.m_odr.name, :remise => number_to_currency(self.remise.to_f), :civilite => self.particular_civilite, :nom => self.particular_name, :prenom => self.particular_firstname  }, :m_odr => self.m_odr, :m_odr_rep => self, :element => element})
+      mail_hist = MailHist.generate_mail(:fr, mail_type, self.particulars.first.email, {:arguments => {:numero_bon_achat => self.ba_number, :bon_achat => ("<center><img src='#{self.ba_url}' style='display:block;margin;auto;' /></center>" if self.m_odr.ba_generation),:nom_odr => self.m_odr.name, :remise => number_to_currency(self.remise.to_f), :civilite => self.particular_civilite, :nom => self.particular_name, :prenom => self.particular_firstname  }, :m_odr => self.m_odr, :m_odr_rep => self, :element => element})
     end
   end
   

app/views/admin/m_odr_reps/_m_odr_rep.html.haml

@@ -2,7 +2,14 @@
   -tr = {}
 
   -tr[:state] = capture do
-    %td=state_helper m_odr_rep.state
+    %td
+      =state_helper m_odr_rep.state
+    
+
+      -if m_odr_rep.state == "Demande validée"
+
+        =link_to "Marquer cette demande comme \"envoyée\"", send_state_admin_m_odr_rep_path(m_odr_rep), :remote => true, :onclick => "$(this).hide();", :class => "btn btn-success", :data => {:confirm => "Voulez-vous vraiment changer le statut de cette demande ?"}
+  
 
   -tr[:m_odr] = capture do
     %td=m_odr_rep.m_odr.name if m_odr_rep.m_odr

app/views/admin/m_odr_reps/index.html.haml

@@ -38,7 +38,7 @@
         %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, :csv => true}
+    =render :partial => "qi/qi_ordered_table_search_footer", :locals => {:collection_object => @m_odr_reps, :csv => (true if current_admin.has_permission?("odr_rep.export_csv"))}
     
     
-=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @m_odr_reps}
+=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @m_odr_reps} if (current_admin.has_permission?("odr_rep.view_all")  or ((params[:name].to_s != "" and params[:name].to_s.size > 2 ) or (params[:reduc_code].to_s != "" and params[:name].to_s.size > 2)))

app/views/admin/m_odr_reps/send_state.js.erb

@@ -0,0 +1,7 @@
+$('#state').html("<%= escape_javascript(render(:partial => "admin/m_odr_reps/state"))%>");
+$('#head').html("<%= escape_javascript(render(:partial => "admin/m_odr_reps/head"))%>");
+$('#left_column').html("<%= escape_javascript(render(:partial => "admin/m_odr_reps/left_column"))%>");
+
+
+$('#m_odr_rep_row_<%= @m_odr_rep.id %>').replaceWith("<%= escape_javascript(render(@m_odr_rep))%>");
+close_pane_hover();