Fixing print pdf method bug

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
 
 

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