diff --git a/app/views/admin/abonnements/_form.html.haml b/app/views/admin/abonnements/_form.html.haml index 6c547c0..303967a 100755 --- a/app/views/admin/abonnements/_form.html.haml +++ b/app/views/admin/abonnements/_form.html.haml @@ -4,8 +4,8 @@ = form.input :reseaux_id, :label => "Réseau :", :collection => Reseaux.where(:parent_id => nil).all, :as => :select, :include_blank => true =form.input :customer_id, :label => "Client :", :collection => Customer.order(:organisation, :name).all, :as => :select, :include_blank => true, :member_label => :name_for_label - = form.input :start_at, :label => "Début", :as => :date - = form.input :end_at, :label => "Fin", :as => :date + = form.input :start_at, :label => "Début", :as => :qi_date_picker + = form.input :end_at, :label => "Fin", :as => :qi_date_picker = form.input :price, :label => "Prix :" = form.input :paid, :label => "Payé ?" diff --git a/app/views/public/my_account/my_reseauxes.html.haml b/app/views/public/my_account/my_reseauxes.html.haml index 87cf59a..5a0d8bc 100644 --- a/app/views/public/my_account/my_reseauxes.html.haml +++ b/app/views/public/my_account/my_reseauxes.html.haml @@ -19,7 +19,7 @@ Plateforme Négos %span Vous choisissez, nous négocions ! - -current_customer.reseauxes.where(:parent_id => nil).each do |reseaux| + -current_customer.reseauxes.where(:parent_id => nil).uniq.each do |reseaux| -if reseaux.default_part == 3 -reseaux_path = public_reseaux_products_path(:reseaux_id => reseaux.id)