diff --git a/app/controllers/admin/p_fournisseurs_controller.rb b/app/controllers/admin/p_fournisseurs_controller.rb index 3b8b041..e406eed 100644 --- a/app/controllers/admin/p_fournisseurs_controller.rb +++ b/app/controllers/admin/p_fournisseurs_controller.rb @@ -23,7 +23,19 @@ class Admin::PFournisseursController < ApplicationController end - + def import_fournisseurs + # @file = params[:csv_file] + # require 'csv' + + # csv_text = File.read("#{Rails.root}/import_csv/fournisseurs.csv") #.force_encoding('ISO-8859-1') + # @csv = CSV.parse(csv_text, :headers => true, :col_sep => ";") + + end + + def import_fournisseurs_xls + raise + end + def index @p_fournisseurs = PFournisseur.order(:name).all diff --git a/app/views/admin/p_fournisseurs/import.html.haml b/app/views/admin/p_fournisseurs/import.html.haml index 276b6d1..41199bd 100644 --- a/app/views/admin/p_fournisseurs/import.html.haml +++ b/app/views/admin/p_fournisseurs/import.html.haml @@ -1,13 +1,14 @@ --@import= true +-if false + -@import= true --i = 0 --@csv.each do |csv| - -i += 1 + -i = 0 + -@csv.each do |csv| + -i += 1 - =csv["code"] - -if csv["code"].to_s != "" - sfsd - -PFournisseur.create(:code => csv["code"],:name => csv["nom"],:address1 => csv["adresse 1"],:address2 => csv["adresse 2"],:cp => csv["code postal"],:city => csv["city"],:country => csv["country"],:email => csv["email"],:tel => csv["tel"]) + =csv["code"] + -if csv["code"].to_s != "" + sfsd + -PFournisseur.create(:code => csv["code"],:name => csv["nom"],:address1 => csv["adresse 1"],:address2 => csv["adresse 2"],:cp => csv["code postal"],:city => csv["city"],:country => csv["country"],:email => csv["email"],:tel => csv["tel"]) diff --git a/app/views/admin/p_fournisseurs/import_fournisseurs.html.haml b/app/views/admin/p_fournisseurs/import_fournisseurs.html.haml new file mode 100644 index 0000000..1010d73 --- /dev/null +++ b/app/views/admin/p_fournisseurs/import_fournisseurs.html.haml @@ -0,0 +1,16 @@ +.qi_header + .right + %h1 + Import + %span + Fournisseurs + + +.qi_row + .qi_pannel.qi_plain.padding + %table.table + %tr + %td + =form_with url: import_fournisseurs_xls_admin_p_fournisseurs_path() do |form| + =form.file_field_tag 'Base client', accept: '.xls, .xlsx' + =form.submit_tag 'importer' diff --git a/app/views/admin/p_fournisseurs/index.html.haml b/app/views/admin/p_fournisseurs/index.html.haml index f77d543..22fa1ce 100644 --- a/app/views/admin/p_fournisseurs/index.html.haml +++ b/app/views/admin/p_fournisseurs/index.html.haml @@ -1,7 +1,7 @@ .qi_header .right = link_to 'Ajouter un fournisseur', new_admin_p_fournisseur_path(), :class => "btn btn-primary", :remote => true - + =link_to 'import base fournisseurs', import_fournisseurs_admin_p_fournisseurs_path(), :class => "btn btn-primary" %h1 Achats %span @@ -28,4 +28,4 @@ %tbody#p_fournisseurs_rows =render @p_fournisseurs - \ No newline at end of file + diff --git a/config/routes.rb b/config/routes.rb index a5835ca..355ebde 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -967,6 +967,8 @@ Rails.application.routes.draw do resources :p_fournisseurs do collection do get :import + get :import_fournisseurs + post :import_fournisseurs_xls end