From 5d1e383e6ac089fe91b407fc643d6a272723a211 Mon Sep 17 00:00:00 2001
From: Nicolas VARROT <nicolas.varrot@quartz.xyz>
Date: Tue, 27 Sep 2016 12:42:12 +0200
Subject: [PATCH] Bug fix

---
 app/controllers/admin/offers_controller.rb     | 4 ++--
 app/controllers/public/documents_controller.rb | 8 +-------
 app/models/document.rb                         | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/controllers/admin/offers_controller.rb b/app/controllers/admin/offers_controller.rb
index ecce4e3..a213ece 100755
--- a/app/controllers/admin/offers_controller.rb
+++ b/app/controllers/admin/offers_controller.rb
@@ -121,7 +121,7 @@ class Admin::OffersController < ApplicationController
   def download_zip
 
     require 'zip'
-    
+
     @offer = Offer.find(params[:id])
 
 
@@ -145,7 +145,7 @@ class Admin::OffersController < ApplicationController
 
           if document.document.file
             if document.particulars?
-              zipfile.add("#{customer_name}/#{document_name}/#{document.title}-NÉGOS.pdf", document.get_particularized_document_file.path)
+              zipfile.add("#{customer_name}/#{document_name}/#{document.title}-NÉGOS.pdf", document.get_particularized_document_file_path)
             else
               zipfile.add("#{customer_name}/#{document_name}/#{document.title}-NÉGOS.pdf", document.document.current_path)
             end
diff --git a/app/controllers/public/documents_controller.rb b/app/controllers/public/documents_controller.rb
index 34e24f6..09e1e5c 100755
--- a/app/controllers/public/documents_controller.rb
+++ b/app/controllers/public/documents_controller.rb
@@ -34,13 +34,7 @@ class Public::DocumentsController < ApplicationController
     end
     if @document.particulars
 
-
-
-      send_data @document.get_particularized_document_file , :filename =>"negos-document-#{@document.id}.pdf" , :type => 'application/pdf',:disposition => (params[:inline] ? 'inline' : "attachment")
-
-
-
-
+      send_data @document.get_particularized_document_file_path , :filename =>"negos-document-#{@document.id}.pdf" , :type => 'application/pdf',:disposition => (params[:inline] ? 'inline' : "attachment")
 
       #render :inline => "j"
     else
diff --git a/app/models/document.rb b/app/models/document.rb
index a3a945a..392eb1b 100755
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -75,7 +75,7 @@ class Document < ActiveRecord::Base
   end
 
 
-  def get_particularized_document_file
+  def get_particularized_document_file_path
     @temp_file = "#{Rails.root}/pdf/documents/#{self.id}_temp.pdf"
     @final_file = "#{Rails.root}/pdf/documents/#{self.id}.pdf"
     @final_file2 = "#{Rails.root}/pdf/documents/#{self.id}-2.pdf"
@@ -110,8 +110,8 @@ class Document < ActiveRecord::Base
 
     ::POSIX::Spawn::Child.new 'pdftk', "A="+self.document.file.path, 'B='+@final_file ,"cat", "B1", "A2-end", 'output',  @final_file2
 
+    @final_file2
 
-    @data_to_send = File.open( @final_file2).read
   end
 
 end