adding adresse qi_s, adding link_to_remove_fields

This commit is contained in:
Philippe 2021-11-18 13:55:34 +01:00
parent 43e26cabf2
commit 94fd558c30
4 changed files with 33 additions and 41 deletions

View File

@ -12,7 +12,7 @@ class PriceLine < ApplicationRecord
#has_many :price_line_demands, through: :price_line_resp_selects #has_many :price_line_demands, through: :price_line_resp_selects
has_many :price_line_p_articles has_many :price_line_p_articles
has_many :p_articles, through: :price_line_p_articles has_many :p_articles, through: :price_line_p_articles
accepts_nested_attributes_for :p_articles accepts_nested_attributes_for :p_articles, allow_destroy: true
accepts_nested_attributes_for :price_line_p_articles accepts_nested_attributes_for :price_line_p_articles
default_scope { order('position ASC') } default_scope { order('position ASC') }

View File

@ -16,6 +16,7 @@
=render :partial => "qi/actions", :locals => {:f => f} =render :partial => "qi/actions", :locals => {:f => f}
/.actions=f.submit "sauvegarder", :class => "btn btn-primary" /.actions=f.submit "sauvegarder", :class => "btn btn-primary"
- elsif params[:controller] == "admin/price_lines" - elsif params[:controller] == "admin/price_lines"
.field
= form.inputs do = form.inputs do
=@price_line.price_line_block.price_lineable.tva_type_id =@price_line.price_line_block.price_lineable.tva_type_id
@ -34,3 +35,4 @@
= form.semantic_fields_for :p_article_serial_nums do |form| = form.semantic_fields_for :p_article_serial_nums do |form|
=render :partial => "admin/p_article_serial_nums/form", :locals => {:form => form} =render :partial => "admin/p_article_serial_nums/form", :locals => {:form => form}
%p= link_to_add_fields "Ajouter un numéro de série", form, :p_article_serial_nums, {:class => "btn btn-primary"} %p= link_to_add_fields "Ajouter un numéro de série", form, :p_article_serial_nums, {:class => "btn btn-primary"}
%p.destroy{class: "btn btn-danger"}=link_to_remove_fields "Supprimer l'article", form

View File

@ -1,26 +1,16 @@
.particular_apercu %tr#particular_row{:id => particular.id}
-if particular.organisation? -tr = {}
=particular.organisation
-if particular.firstname? or particular.name? -tr[:actions] = capture do
%strong %td.actions
=particular.firstname = link_to i(:"trash-o"), [:admin, particular], method: :delete, data: { confirm: 'Voulez-vous vraiment supprimer cet enregistrement ? ' } , :remote => true
= link_to i(:pencil), edit_admin_particular_path(particular), :remote => true
= link_to i(:eye), admin_particular_path(particular), :remote => true
=render :partial => "qi/qi_ordered_table_object", :locals => {:tr => tr, :object => particular}
=particular.name
%br
=particular.address_2
-if particular.address_3?
%br
=particular.address_3
%br
=particular.cp
=particular.city
%br
=particular.country
%br
=particular.tel
%br
=particular.email

View File

@ -5,6 +5,6 @@
.p_articles_form .p_articles_form
= f.semantic_fields_for :p_articles do |form| = f.semantic_fields_for :p_articles do |form|
=render :partial => "admin/p_articles/form", :locals => {:form => form, @price_line => f.object} =render :partial => "admin/p_articles/form", :locals => {:form => form, @price_line => f.object}
%p= link_to_add_fields "Ajouter un article", f, :p_articles, {:class => "btn btn-primary"} if f.object.p_articles.count < f.object.qte %p= link_to_add_fields "Ajouter un article", f, :p_articles, {:class => "btn btn-primary"} if f.object.p_articles.count < f.object.qte
-# %span.destroy{style: "font-size: 2rem;"}=link_to_remove_fields ic(:"trash-o"), f
=render :partial => "qi/actions", :locals => {:f => f} =render :partial => "qi/actions", :locals => {:f => f}