This commit is contained in:
Nicolas Bally 2019-01-30 22:36:49 +01:00
parent 0bdf827506
commit 14b7d607a5

View File

@ -12,7 +12,7 @@
%div{:style => "position:relative;width:6cm;margin-right:0.2cm;float:right;"} %div{:style => "position:relative;width:6cm;margin-right:0.2cm;float:right;"}
%div{:style => "border:1px solid black;padding:4px 8px;min-height:80px;"} %div{:style => "border:0px solid black;padding:4px 8px;min-height:80px;"}
%h3{:style => "position:absolute;top:-30px;"} Adresse de facturation %h3{:style => "position:absolute;top:-30px;"} Adresse de facturation
@ -34,16 +34,17 @@
%br %br
=@p_document.particular_bill.country =@p_document.particular_bill.country
.p_contacts -if false
-@element.particular_bill.p_contacts.each do |p_contact| .p_contacts
.p_contact -@element.particular_bill.p_contacts.each do |p_contact|
=p_contact.name if p_contact.name? .p_contact
=p_contact.tel if p_contact.tel? =p_contact.name if p_contact.name?
=link_to p_contact.email, "mailto:"+p_contact.email.to_s if p_contact.email? =p_contact.tel if p_contact.tel?
=link_to p_contact.email, "mailto:"+p_contact.email.to_s if p_contact.email?
%div{:style => "position:relative;width:6cm;margin-right:0.5cm;float:right;"} %div{:style => "position:relative;width:6cm;margin-right:0.5cm;float:right;"}
%div{:style => "border:1px solid black;padding:4px 8px;min-height:80px;"} %div{:style => "border:0px solid black;padding:4px 8px;min-height:80px;"}
%h3{:style => "position:absolute;top:-30px;"} Adresse de livraison %h3{:style => "position:absolute;top:-30px;"} Adresse de livraison
@ -65,12 +66,13 @@
%br %br
=@p_document.particular_send.country =@p_document.particular_send.country
.p_contacts -if false
-@element.particular_send.p_contacts.each do |p_contact| .p_contacts
.p_contact -@element.particular_send.p_contacts.each do |p_contact|
=p_contact.name if p_contact.name? .p_contact
=p_contact.tel if p_contact.tel? =p_contact.name if p_contact.name?
=link_to p_contact.email, "mailto:"+p_contact.email.to_s if p_contact.email? =p_contact.tel if p_contact.tel?
=link_to p_contact.email, "mailto:"+p_contact.email.to_s if p_contact.email?
%p{:style => "clear:both;height:0.5cm;"} %p{:style => "clear:both;height:0.5cm;"}