diff --git a/app/controllers/admin/price_documents_controller.rb b/app/controllers/admin/price_documents_controller.rb index 7cb043d..b2458c6 100644 --- a/app/controllers/admin/price_documents_controller.rb +++ b/app/controllers/admin/price_documents_controller.rb @@ -615,11 +615,26 @@ class Admin::PriceDocumentsController < ApplicationController end - def final_consult - @params = params - @demande_prix = PriceDocument.find(params[:id]) - @final_consult = PriceDocument.new(price_document_type_id: 10) - # @final_consult.price_line_block.new(params.require[:price_document][:price_line_block_attributes].permit!) + def generate_final_consult + # price_line_to_add ={id_fournisseur {price_line_resp_id: id, ||||| id priceline resp => id price line selectionné, prix} } + + price_lines_to_add = {p_fournisseur_id: 0} + + @price_document_demand = PriceDocument.find(params[:id]) + @price_document_responses = PriceDocument.where(doc_ref_id: price_document_demand) + @result = [] + + @price_document_demand.price_line_block.price_lines.each do |pl_demand| + pl_response = pl_demand.price_line_resps.first + @p_fournisseur = PFournisseur.find(pl_response) + @final_consult.price_line_block.new(params.require[:price_document][:price_line_block_attributes].permit!) + @price_document = PriceDocument.new(:p_fournisseur_id => params[:p_fournisseur_id]) + + PriceDocument.new() + @result << pl_demand + render :consult_index + + # @price_document = PriceDocument.new(:p_customer_id => params[:p_customer_id], :p_fournisseur_id => params[:p_fournisseur_id]) # @price_document.price_document_type = PriceDocumentType.where(:label => "Réponse fournisseur").first # @price_document.price_line_block = PriceLineBlock.new(:p_customer_id => params[:p_customer_id], :p_fournisseur_id => params[:p_fournisseur_id]) @@ -631,4 +646,12 @@ class Admin::PriceDocumentsController < ApplicationController # @price_document.price_line_block.price_lines << PriceLine.new(:price_line_ref_id => plr.id, :p_product_ref_id => plr.p_product_ref_id, :qte => @ref_price_lines.where(:p_product_ref_id => plr.p_product_ref_id).sum(:qte)) # end end + + def final_consult + @price_document = PriceDocument.find(params[:id]) + if @price_document.update_attributes(params.require(:price_document).permit!) + else + render :edit + end + end end diff --git a/app/views/admin/price_documents/analyse_reponses.html.haml b/app/views/admin/price_documents/analyse_reponses.html.haml index 35139c9..2e027e3 100644 --- a/app/views/admin/price_documents/analyse_reponses.html.haml +++ b/app/views/admin/price_documents/analyse_reponses.html.haml @@ -224,7 +224,7 @@ .modal-footer %button.btn.btn-light{"data-dismiss" => "modal"} Close - +=link_to "Generer les consultations", generate_final_consult_admin_price_document_path, class: "btn btn-primary ml-4 mt-4" diff --git a/app/views/admin/price_documents/consult_index.html.haml b/app/views/admin/price_documents/consult_index.html.haml new file mode 100644 index 0000000..4ffa515 --- /dev/null +++ b/app/views/admin/price_documents/consult_index.html.haml @@ -0,0 +1,2 @@ +%h1 Hello +=debug @result diff --git a/app/views/admin/price_documents/final_consult.html.haml b/app/views/admin/price_documents/final_consult.html.haml deleted file mode 100644 index cb99cd5..0000000 --- a/app/views/admin/price_documents/final_consult.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -%h1 Hello -=debug @final_consult -%h1 Params -=debug @params diff --git a/config/routes.rb b/config/routes.rb index ff939f3..dbbb448 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -630,6 +630,7 @@ Rails.application.routes.draw do patch :match_p_fournisseur_save get :analyse_reponses post :final_consult + get :generate_final_consult end collection do get :search_to_affect