diff --git a/app/views/admin/price_line_blocks/_form_demande_prix.html.haml b/app/views/admin/price_line_blocks/_form_demande_prix.html.haml index 28deefc..14a5e63 100644 --- a/app/views/admin/price_line_blocks/_form_demande_prix.html.haml +++ b/app/views/admin/price_line_blocks/_form_demande_prix.html.haml @@ -21,7 +21,7 @@ =f.semantic_fields_for :price_lines do |f| =render :partial => "admin/price_lines/form_#{f.object.block_type_slug}", :locals => {:form => f} - %p= link_to_add_fields "Ajouter une ligne", f, :price_lines, {:class => "btn btn-primary"} + %p= link_to_add_fields "Ajouter une ligne", f, :price_lines, {slug: f.object.block_type_slug , :class => "btn btn-primary", tabindex: 2} - \ No newline at end of file + diff --git a/app/views/admin/price_lines/_form_demande_prix.html.haml b/app/views/admin/price_lines/_form_demande_prix.html.haml index 0661845..ed5a37a 100644 --- a/app/views/admin/price_lines/_form_demande_prix.html.haml +++ b/app/views/admin/price_lines/_form_demande_prix.html.haml @@ -1,98 +1,24 @@ - -.qi_pannel.qi_plain.padding.price_line_form.field{:style =>"border-left:4px solid gray;margin-bottom:10px;padding-left:5px;"} - %table{:style => "width:100%;"} - %tr - %td{:style => "width:30px;"} - .take +.qi_pannel.qi_plain.padding.price_line_form.col-12.field{:style =>"border-left:4px solid gray;margin-bottom:10px;padding-left:5px;"} + - price_line = form.object + .row + .col-6.row + .col-2.d-flex + .take.mx-3 =ic :arrows - %td - - = form.input :ct_title, :label => "Designation personnalisée : " if @avoir - %div{:class => ("error has-error" if form.object.errors[:p_product_ref_id].size > 0 )} - %label Produit : - %input.p_product_ref_autocomplete_input.form-control{:disabled => true, :type => "text", :value => ("#{form.object.p_product_ref.member_label}" if form.object.p_product_ref)} - - - = form.hidden_field :p_product_ref_id, :class => "p_product_ref_id" - - :javascript - $( function() { - - $('.p_product_ref_autocomplete_input').autocomplete({ - source: function( request, response ) { - $.ajax( { - url: "/admin/p_product_refs/autocomplete.json", - dataType: "json", - data: { - search: request.term, - }, - success: function(data){ - - arr = jQuery.map( data, function( item ) { - return { - label: item.member_label, - value: item.member_label, - id: item.id - } - }); - - response(arr) - - } - - } ); - }, - minLength: 2, - select: function( event, ui ) { - - $(this).next(".p_product_ref_id").val(ui.item.id) - - form = $(this).closest(".price_line_form") - - - - $.ajax( { - url: "/admin/p_product_refs/"+ui.item.id+"/get_infos.json", - dataType: "json", - data: { - type: "price", - qte: form.find(".input_price_line_qte").val(), - p_customer_id: $(".p_customer_id").val() - }, - success: function (data) { - form.find(".input_price_line_price_u_ht").val(data.price); - form.find(".input_price_line_tva_account_id").val(data.tva_account_id); - form.find(".input_price_line_tva_account_value").val(data.tva_account_value); - form.find(".input_price_line_weight_u").val(data.weight); - - - - } - - - } ); - - - - - //return false - } - }); - - - - } ); - - - %table.top_td{:style => "width:100%;margin-top:5px;"} - %tr - %td{:style => "width:30px"} - %span.destroy=link_to_remove_fields ic(:"trash-o"), form - - %td - = form.input :qte, :label => "qte :", :input_html => {:class => "input_price_line_qte"} - - + %label + ref : + %input.p_product_ref_autocomplete_input.form-control.col{:type => "text", tabindex: 1, autofocus: true, :value => ("#{form.object.p_product_ref.ref} #{form.object.p_product_ref.cc_name}" if form.object.p_product_ref)} + + .col-3.ml-4 + .form-inline + = form.input :qte, :label => "qte :", :input_html => { class: "mx-2", tabindex: 1} + .col-1 + %span.destroy=link_to_remove_fields ic(:"trash-o"), form + = form.hidden_field :p_product_ref_id, :class => "p_product_ref_id" + + + + =qi_js_field(form, :price_line, :tva_account_value, :hidden => true) + + = form.hidden_field :position, :class => "price_line_position_input" - = form.hidden_field :position, :class => "price_line_position_input" - diff --git a/app/views/admin/price_lines/_form_demande_prix_OLD.html.haml b/app/views/admin/price_lines/_form_demande_prix_OLD.html.haml new file mode 100644 index 0000000..0661845 --- /dev/null +++ b/app/views/admin/price_lines/_form_demande_prix_OLD.html.haml @@ -0,0 +1,98 @@ + +.qi_pannel.qi_plain.padding.price_line_form.field{:style =>"border-left:4px solid gray;margin-bottom:10px;padding-left:5px;"} + %table{:style => "width:100%;"} + %tr + %td{:style => "width:30px;"} + .take + =ic :arrows + %td + + = form.input :ct_title, :label => "Designation personnalisée : " if @avoir + %div{:class => ("error has-error" if form.object.errors[:p_product_ref_id].size > 0 )} + %label Produit : + %input.p_product_ref_autocomplete_input.form-control{:disabled => true, :type => "text", :value => ("#{form.object.p_product_ref.member_label}" if form.object.p_product_ref)} + + + = form.hidden_field :p_product_ref_id, :class => "p_product_ref_id" + + :javascript + $( function() { + + $('.p_product_ref_autocomplete_input').autocomplete({ + source: function( request, response ) { + $.ajax( { + url: "/admin/p_product_refs/autocomplete.json", + dataType: "json", + data: { + search: request.term, + }, + success: function(data){ + + arr = jQuery.map( data, function( item ) { + return { + label: item.member_label, + value: item.member_label, + id: item.id + } + }); + + response(arr) + + } + + } ); + }, + minLength: 2, + select: function( event, ui ) { + + $(this).next(".p_product_ref_id").val(ui.item.id) + + form = $(this).closest(".price_line_form") + + + + $.ajax( { + url: "/admin/p_product_refs/"+ui.item.id+"/get_infos.json", + dataType: "json", + data: { + type: "price", + qte: form.find(".input_price_line_qte").val(), + p_customer_id: $(".p_customer_id").val() + }, + success: function (data) { + form.find(".input_price_line_price_u_ht").val(data.price); + form.find(".input_price_line_tva_account_id").val(data.tva_account_id); + form.find(".input_price_line_tva_account_value").val(data.tva_account_value); + form.find(".input_price_line_weight_u").val(data.weight); + + + + } + + + } ); + + + + + //return false + } + }); + + + + } ); + + + %table.top_td{:style => "width:100%;margin-top:5px;"} + %tr + %td{:style => "width:30px"} + %span.destroy=link_to_remove_fields ic(:"trash-o"), form + + %td + = form.input :qte, :label => "qte :", :input_html => {:class => "input_price_line_qte"} + + + + = form.hidden_field :position, :class => "price_line_position_input" +