diff --git a/app/views/admin/admins/_form.html.haml b/app/views/admin/admins/_form.html.haml index b2a6e0d..c19b596 100644 --- a/app/views/admin/admins/_form.html.haml +++ b/app/views/admin/admins/_form.html.haml @@ -36,8 +36,5 @@ =f.input :admin_roles, :label => "Rôles :", :collection => AdminRole.all, :as => :check_boxes - - =f.input :p_customers, :label => "Vue autorisée pour les clinets suivant :", :collection => PCustomer.all, :as => :check_boxes - .actions= f.submit "Sauvegarder", :class => "btn btn-primary" diff --git a/app/views/admin/m_odr_primes/show.html.haml b/app/views/admin/m_odr_primes/show.html.haml index e42891d..36ebbe3 100644 --- a/app/views/admin/m_odr_primes/show.html.haml +++ b/app/views/admin/m_odr_primes/show.html.haml @@ -75,7 +75,12 @@ -if @m_odr_prime.state == "A traiter" and @m_odr_prime.m_odr_virements.where(:refused => false).count == 0 - =link_to "Générer le virement", generate_virement_admin_m_odr_prime_path(@m_odr_prime), :class => "btn btn-primary" + + -if @m_odr_prime.m_odr_file_roulage.date? and @m_odr_prime.m_odr_file_roulage.date <= Date.now + =link_to "Générer le virement", generate_virement_admin_m_odr_prime_path(@m_odr_prime), :class => "btn btn-primary" + -else + %span.btn.btn-default + Vous pourrez générer le virement une fois la date de roulage passée. %hr Virements diff --git a/app/views/admin/p_customers/_form.html.haml b/app/views/admin/p_customers/_form.html.haml index e001f90..b8bf8d5 100755 --- a/app/views/admin/p_customers/_form.html.haml +++ b/app/views/admin/p_customers/_form.html.haml @@ -48,7 +48,8 @@ = form.input :password, :label => "Mot de passe :", :input_html => { :autocomplete => "new-password"}, :as => :string - + = form.input :mlm_token, :label => "Code ambassadeur :" + .qi_row