From 7508ae2e65ee3331ce0e3f2b9b3d3bc751d98c9f Mon Sep 17 00:00:00 2001 From: Philippe Date: Thu, 11 Nov 2021 01:14:14 +0100 Subject: [PATCH] Fixing print pdf method bug --- .../(__TEMPLATE__)c | Bin 1374 -> 5965 bytes app/models/price_document.rb | 11 +- .../admin/price_documents/print.html.haml | 97 +++++------------- pdf_stamp/{en-tête.pdf => en-tete.pdf} | Bin 4 files changed, 31 insertions(+), 77 deletions(-) rename pdf_stamp/{en-tête.pdf => en-tete.pdf} (100%) diff --git a/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c b/.sass-cache/f6b9a0b1905a68d5dbb2139e95d49cba92f6fa93/(__TEMPLATE__)c index e1c3ae14c64ffb6b86d264611307231a215c18c3..f14f6942a4eff9a4b9af0c9026e5b8e2e708b671 100644 GIT binary patch literal 5965 zcmbVQUvt~W5f?Qbii9jtbo9@ZEVHzu*orOEk{sE0Gwmg=JYgnrG#1krJz$RHi9!S7 zPym#pdi>UWh4f?eOSNC2eQb9Re~w2&ij*hfh}*s2?(P0|7yG-1y9d_c!NDQ#?RC4a z&iLMo?w)8J?Dt;r=l$Nx7hJsT9f~iyqPyR+epiy@-U$ywLOOvEguIh7dMo?l4q0Tq zbI0um!aFTbZW_4)H&uwm0(d?xwi{~?yRv_2hY^pQFmnDn5@C@Pk2>To^LY@8zKuIW zNgDBSC&CrINCt$wmct=G5g_69M2Rf0p%`{W5S|t#xj(r%-8VNw?l5_F z7K#WS7ntz+N`%(bOS<8#!_f$_1yI3y8AKvzp&-2*|HO}EgN2FDZ37=&FVlNc>nqaD zvDG@g-)?;J*tR=I-yMJZW#`DYpA^ACbW4(YjJlm13PJP+aDwKJ%Sg~6E^pK)C+zI1b6Mr)MRR}EnL|f^(xS`RQFKjS@6{!GzeTt3dXzB!B##da$vL>+Qg$D>x=Zh~8r@|8sY@TY!Y6Q!}IKdyCapKFPl4E-urP7$dT74kGjsl?nze$M#k2E9|sWk zB3j>Rs`~)1UHXE|hnNKs_-+Qwg+P=(Mrin929TE~3@!msD}#+IlER*#lH)-7NF_^j z2`^(sV|=FIsVmvWR8NBKq!&1Tl+x9=4g@=QOLTi`!=KS|LQbLpqM%H-k)pnM{o<>` zug0uY>YuPz^fOX%`e2`P=7@kaSYP;o=OhIEWMQ_gNoolT>(b;xX;eu+AHx{ie#?w+ zWEqcV!HqBccAROo$Z#HqV$_%OWSOY|1CRA=m9=q*Z9XNlh7>GW0KecT)8ePxB^Lo#7dHWdWS-qw;QL;9hLYup(v|9#%VEMkot6z zr&LBiqmRw3TTBBqNrOeers=i(Oq=( z(!`ldaLQulS6pqSXDW(s(v}H2Pk{z)DtI1O6IS@Ual%4&!k$rX5-hCnbGkvBUG2)C zFM?-*GdPb_9w03n)~_D;Kh;C&I{ow()IPyK z^M5f;Sk6u`%}=nf!auSN84WI^xLKI#GDCTs%WAo7rM&U0{l#@WwS1E-)wzabyOCw7 z60SPS5QOT{%+h7pt0i#-l2>Kv{w=aJX(XnzZzXkUl6@<1roKsB?WYKI7*1p#d6aPW zL|YI>No#Ll=OhJ6`QE2sXD6@-dY9!EN7vJt9z-p=v`Jzflk<)0DU{c5zC_6XQkHe3#{~H zg?XbPG*d8>*(1*ZZ_Plb0X>m~?%4Qukx3u{_|t7SP#gfhftbnzxM2X)#0CJt*FTEO z_dqHz|7^wX{2_8&Lf*ND=b&|heb5tN9|!Fwl&>N8;dh>ezRO`0gALH^ z5A1k(1(J$^w38A6pX>PYmMm7xYc z(Uk#Lx`9uJ(5ySUdV(`rg==TAv{%?jothMg4LG`%c^6ktvzy2bhCBs27)%9eFwAZh zj3czIX0wohVY3ekDTwKexTaOSkq0&>Jg^BiuV(OY^*B8|pAqsDXb+eQG7q%02XMz# z`H+BNv(GaR=!B@H$k}W~t22XVKb;k!7QiPXWOMi+H~VgO`di`$t6tY1YH(GrH=Fuv z!Og}65Yi&o3=E+Dqh)=xa=W;jOr!{~*}TOdV;FNivRLcnph4lp@eZA6!c8V33I^p{ zbbGWhhB~%Kj}?-qb!Y^hj14~5;2A3b3ez+fBA}aIRAO|3C};XZv#q3w%DzY>jDiia NrnY#MHog0u{{w}+6Mp~z delta 389 zcmX@BcaKZYSkGL~gv-Ft$jCf3HQB=4I4#v6HPtxPBq=#1&D_W+H6It+*WW5_3~Mm3W{MlU*3sGxAOT!WauA zgP5*QUc@3R#*>m+T#%Dk$!5(NV#V!HmY7qT8qGFYo>zSGdlp?8&b<7*RInVcLw-R? zW`16AH3QJ(lFEYA$(F48%IwzS`PLGg){^!FD8Pv&LQl7O1)pl>bfAZ0D*AZ;yVV6Ew(F}aIP8t9#DHaRm5D?W#k v)Lfu%N`SsrfrUpkmx2P+lU5+#SaWgJa&d8iJOy+U+vJbjiacy^Qw>7^kL+bZ 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