diff --git a/app/views/admin/import_csvs/_form_temp_p_product.html.haml b/app/views/admin/import_csvs/_form_temp_p_product.html.haml index 9173a3d..f5a2ac1 100644 --- a/app/views/admin/import_csvs/_form_temp_p_product.html.haml +++ b/app/views/admin/import_csvs/_form_temp_p_product.html.haml @@ -4,21 +4,27 @@ .qi_row.field .padding - %h1 Ajouter une références + %h1 Ajouter une référence + .card.border.border-primary.mb-3 + %h5.card-header.border-bottom Rappel des infos fournisseurs + .card-body + %h5.card-title libellé : + %p.card-text + =@p_product_ref.ct_sub_name + + %table.form-table %tr %td{colspan: 3} - %label Selectionner le produit parent + %label Selectionner le produit parent : .input-group %input.p_product_autocomplete_input.form-control{:type => "text", :style => "", tabindex: 1, autofocus: true, :class => "p_product_name"} =form.hidden_field :p_product_id, :class => "p_product_id" =link_to ic(:plus)+ " Ajouter produit", new_admin_p_product_path(fournisseur_label: @p_product_ref.ct_sub_name, price_line_id: @price_line.id) + %br - %tr - %td{:colspan => 3} - %input.form-control{type: "text", placeholder: @p_product_ref.ct_sub_name, "aria-label" => "Disabled input example", disabled: true} - =#form.input :ct_sub_name, label: "Label fournisseur", input_html: {disabled: true} + %tr{height: "20px"} %tr %td{:colspan => 3} @@ -34,9 +40,9 @@ =form.input :p_product_color_id, :label => "Couleur :", :collection => PProductColor.all, :as => :select, :include_blank => true, input_html: {class: "custom-select"} %tr %td - =form.input :ct_sorecop, :label => "Sorecop personalisée :" + =form.input :ct_sorecop, :label => "Sorecop personalisée (€) :" %td - =form.input :sorecop_comment, :label => "Type de Sorecop :" + =form.input :sorecop_comment, :label => "Commentaire Sorecop :" %td =form.input :ct_deee, :label => "DEEE personalisée :" %tr diff --git a/app/views/admin/import_csvs/match_refs.html.haml b/app/views/admin/import_csvs/match_refs.html.haml index c44a8c0..c55dd77 100644 --- a/app/views/admin/import_csvs/match_refs.html.haml +++ b/app/views/admin/import_csvs/match_refs.html.haml @@ -17,8 +17,9 @@ %th %th Référence Produit Arcom %th Créer une référence - %th Référence fournisseur - %th + %th Libélé fournisseur + %th Prix unitaire + %th Quantité %tbody.price_lines_form =f.semantic_fields_for :price_lines do |form| -if form.object.p_product_ref.nil? diff --git a/app/views/admin/price_lines/_form_match_refs.html.haml b/app/views/admin/price_lines/_form_match_refs.html.haml index fb4fc62..0fd0b42 100644 --- a/app/views/admin/price_lines/_form_match_refs.html.haml +++ b/app/views/admin/price_lines/_form_match_refs.html.haml @@ -24,9 +24,13 @@ %span=link_to ic(:"plus"), temp_p_product_admin_import_csvs_path(price_line_id: form.object.id), remote: true - + %td.pl-2 =form.object.title + %td + =number_to_currency form.object.price_u_ht + %td + =form.object.qte %td.text-center{style: "width: 30px;"} %span.destroy=link_to_remove_fields ic(:"trash-o"), form @@ -35,7 +39,6 @@ = form.hidden_field :position, :class => "price_line_position_input" - :javascript $('.p_product_ref_autocomplete_input').focus() $( function() {