diff --git a/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c b/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c index e1c3ae1..f14f694 100644 Binary files a/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c and b/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c differ diff --git a/app/models/price_document.rb b/app/models/price_document.rb index d9568c0..f6ee432 100644 --- a/app/models/price_document.rb +++ b/app/models/price_document.rb @@ -638,21 +638,18 @@ class PriceDocument < ApplicationRecord system("node #{pdf}.js #{Shellwords.escape(url)} #{Shellwords.escape(@temp_file)}") - - require 'posix/spawn' ::POSIX::Spawn::Child.new 'pdftk', @temp_file, 'stamp', "#{Rails.root}/pdf_stamp/en-tete.pdf", 'output', @final_file - # if true + if self.label != "Bon de livraison" #::POSIX::Spawn::Child.new 'pdftk', @final_file,"#{Rails.root}/pdf_stamp/cgv.pdf", 'cat', 'output', @final_file2 #AJOUT CGV + #return @final_file2 + File.rename(@final_file, @final_file2) + File.delete(@temp_file) if File.exist?(@temp_file) return @final_file2 else return @final_file end - - # File.rename(@temp_file, @final_file2) - #File.delete(@temp_file) if File.exist?(@temp_file) - #File.delete(@final_file) if File.exist?(@final_file) end diff --git a/app/views/admin/price_documents/print.html.haml b/app/views/admin/price_documents/print.html.haml index 349e5fc..30df4e2 100644 --- a/app/views/admin/price_documents/print.html.haml +++ b/app/views/admin/price_documents/print.html.haml @@ -50,57 +50,9 @@ table, tbody { font-size: 13px; } - - - - - - - - - -price_line_block = @price_document.price_line_block %body - - -if @price_document.label == "Bon de livraison" - -@bl = true - -particular_doc = price_line_block.particular_send - - - -else - -particular_doc = price_line_block.particular_bill - - - -if particular_doc.organisation? - %strong=particular_doc.organisation - -if particular_doc.com_name? - %br - =particular_doc.com_name - - %br - -if particular_doc.firstname? or particular_doc.name? - =particular_doc.civilite - - =particular_doc.firstname - - =particular_doc.name - %br - - =particular_doc.address_2 - - -if particular_doc.address_3? - %br - =particular_doc.address_3 - %br - =particular_doc.cp - - =particular_doc.city - %br - =particular_doc.country - - - %table %thead %tr @@ -139,7 +91,33 @@ %td %p{style: "line-height: 3px;"} Josef Falser %p{style: "line-height: 3px;"} zona produttiva Bodner 2 - %p{style: "line-height: 3px;"} 39053 Prato Isarco, IT + %p{style: "line-height: 3px;"} + 39053 Prato Isarco, IT + -if @price_document.label == "Bon de livraison" + -@bl = true + -particular_doc = price_line_block.particular_send + -else + -particular_doc = price_line_block.particular_bill + -if particular_doc.organisation? + %strong=particular_doc.organisation + -if particular_doc.com_name? + %br + =particular_doc.com_name + %br + -if particular_doc.firstname? or particular_doc.name? + =particular_doc.civilite + =particular_doc.firstname + =particular_doc.name + %br + =particular_doc.address_2 + -if particular_doc.address_3? + %br + =particular_doc.address_3 + %br + =particular_doc.cp + =particular_doc.city + %br + =particular_doc.country %table{style: "margin-top: 40px"} @@ -209,27 +187,6 @@ %br %br - - - %div{:style => "position:absolute;top:20px;;right:0;"} - %span{:style => "font-size:14pt;font-weight:bold;text-transform:uppercase;"} - =@price_document.label - - %span{:style => "font-weight:normal;"}=@price_document.d_number - - %br - Date : - =l @price_document.date, :format => :date - - - -if @price_document.ref_element_type == "PCustomerSheet" and @price_document.ref_element - -bc = @price_document.ref_element.price_documents.where(:cc_label => "Bon de commande").order("date DESC, created_at DESC").first - -if bc - ="-" - Ref commande : - =bc.d_number - - %table.table{:style => "width:auto;"} %tr %td N° Client diff --git a/pdf_stamp/en-tête.pdf b/pdf_stamp/en-tete.pdf similarity index 100% rename from pdf_stamp/en-tête.pdf rename to pdf_stamp/en-tete.pdf