diff --git a/app/controllers/admin/m_odr_reps_controller.rb b/app/controllers/admin/m_odr_reps_controller.rb index cf00e32..e2dd78c 100644 --- a/app/controllers/admin/m_odr_reps_controller.rb +++ b/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 diff --git a/app/helpers/translation_helper.rb b/app/helpers/translation_helper.rb index 666828d..d94e97d 100755 --- a/app/helpers/translation_helper.rb +++ b/app/helpers/translation_helper.rb @@ -27,13 +27,13 @@ module TranslationHelper value = value.to_s if ["brouillon","Reçue"].include?(value) r = ''+value+'' - elsif ["Virement envoyé", "Validé"].include?(value) + elsif ["Virement envoyé", "Validé", "Envoyée"].include?(value) r = ''+value+'' elsif value == "commande" r = 'Commande' elsif value == "livraison-en-cours" r = 'Livr. en cours' - elsif ["Virement demandé"].include?(value) + elsif ["Virement demandé", "Demande validée"].include?(value) r = ''+value+'' elsif value =="facturée" r = 'Facturée' diff --git a/app/models/m_odr_rep.rb b/app/models/m_odr_rep.rb index 30d2bf1..19570fc 100644 --- a/app/models/m_odr_rep.rb +++ b/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 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 e430090..cda753f 100644 --- a/app/views/admin/m_odr_reps/_left_column.html.haml +++ b/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 diff --git a/app/views/admin/m_odr_reps/show.html.haml b/app/views/admin/m_odr_reps/show.html.haml index 5c15767..6930113 100644 --- a/app/views/admin/m_odr_reps/show.html.haml +++ b/app/views/admin/m_odr_reps/show.html.haml @@ -64,6 +64,8 @@ .clear + + %hr Virements diff --git a/config/routes.rb b/config/routes.rb index 7c7cba4..1a595d3 100644 --- a/config/routes.rb +++ b/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