ajout de statut

app/controllers/admin/m_odr_reps_controller.rb

@@ -122,6 +122,16 @@ class Admin::MOdrRepsController < ApplicationController
     @m_odr_rep.change_state("Refusée")
     
     
+    redirect_to [:admin, @m_odr_rep]
+  end
+  
+  def send_state
+    @m_odr_rep = MOdrRep.find(params[:id])
+    
+    
+    @m_odr_rep.change_state("Envoyée")
+    
+    
     redirect_to [:admin, @m_odr_rep]
   end
     

app/helpers/translation_helper.rb

@@ -27,13 +27,13 @@ module TranslationHelper
     value = value.to_s
     if ["brouillon","Reçue"].include?(value)
       r = '<span class="badge badge-pill badge-warning">'+value+'</span>'
-    elsif ["Virement envoyé", "Validé"].include?(value)
+    elsif ["Virement envoyé", "Validé", "Envoyée"].include?(value)
       r = '<span class="badge badge-success">'+value+'</span>'
     elsif value == "commande"
       r = '<span class="badge badge-success">Commande</span>'
     elsif value == "livraison-en-cours"
       r = '<span class="badge badge-success" style="background:#036516;">Livr. en cours</span>'
-    elsif ["Virement demandé"].include?(value)
+    elsif ["Virement demandé", "Demande validée"].include?(value)
       r = '<span class="badge badge-info">'+value+'</span>'
     elsif value =="facturée"
       r = '<span class="badge badge-primary">Facturée</span>'

app/models/m_odr_rep.rb

@@ -45,6 +45,8 @@ class MOdrRep < ApplicationRecord
   
   belongs_to :m_odr_product_cat
   
+  
+  
 
   def reduc_needed?
     if self.m_odr.reduc_needed
@@ -130,6 +132,17 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa
     self.save
   end
   
+  
+  after_save do
+    
+    if self.state == "En cours de traitement" and self.m_odr and !self.m_odr.rib_needed and self.file_admin_ok
+      
+      
+      self.state = "Demande validée"
+      self.save
+    end
+  end
+  
   before_validation do
     
     if self.m_odr.buy_date_needed

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

@@ -178,6 +178,16 @@ RIB :
     %br
     =link_to "Générer le virement", generate_virement_admin_m_odr_rep_path(@m_odr_rep), :class => "btn btn-primary"
     
+
+-if @m_odr_rep.state == "Demande validée"
+  
+  %p
+    %br
+    %br
+    =link_to "Marquer cette demande comme \"envoyée\"", send_state_admin_m_odr_rep_path(@m_odr_rep), :class => "btn btn-success"
+    
+    
+    
 -if @m_odr_rep.m_odr.ba_generation
   %br
   %br

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

@@ -64,6 +64,8 @@
           
           
     .clear
+    
+    
     %hr
     Virements
     

config/routes.rb

@@ -267,6 +267,7 @@ Rails.application.routes.draw do
         get :generate_virement
         get :send_mail
         get :refuse
+        get :send_state
         
         get :ba