Pull from master

app/models/printer/order_queue_printer.rb

@@ -1,9 +1,6 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
   def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, before_updated_qty="", options="")
-    #Use CUPS service
-    #Generate PDF
-    #Print
     # Must be one print  
     if print_settings.print_copies == 0
        print_settings.print_copies = 1
@@ -12,7 +9,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     order_item =  print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code)  
 
-    filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
+    # filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
     pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty)
     print_setting = PrintSetting.all
@@ -39,6 +36,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # end  
 
+    shop = Shop.first
+    directory_name = 'public/orders_'+shop.shop_code
+    Dir.mkdir(directory_name) unless File.exists?(directory_name)
+
+    filename = directory_name + "/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
+
     pdf.render_file filename  
 
     if oqs.print_copy
@@ -56,7 +59,9 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       if ENV["SERVER_MODE"] != "cloud"
         self.print(filename, oqs.printer_name)
       end
-    end   
+    end 
+
+    return filename, order_id, oqs.printer_name  
   end
 
    # Query for per order
@@ -72,12 +77,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     print_setting = PrintSetting.all.order("id ASC")
     order=print_query('order_summary', order_id)    
+
+    shop = Shop.first
+    directory_name = 'public/orders_'+shop.shop_code
+    Dir.mkdir(directory_name) unless File.exists?(directory_name)
+
     # For Print Per Item
     if oqs.cut_per_item
 
       order_items.each do|odi|
-        odi_item=print_query('order_item', odi.order_items_id)   
-        filename = "tmp/order_item_#{order_id}" + ".pdf" 
+        odi_item=print_query('order_item', odi.order_items_id)
+
+        filename = directory_name + "/order_item_#{order_id}" + ".pdf" 
+        # filename = "tmp/order_item_#{order_id}" + ".pdf" 
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
@@ -122,7 +134,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/order_summary_#{order_id}" + ".pdf"
+      filename = directory_name + "/order_summary_#{order_id}" + ".pdf" 
+      # filename = "tmp/order_summary_#{order_id}" + ".pdf"
       pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty)
       if !print_setting.empty?
         print_setting.each do |print_settings|
@@ -160,6 +173,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         end
       end
     end
+    return filename, order_id, oqs.printer_name
   end
 
   # Print for orders in booking
@@ -173,10 +187,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     print_setting = PrintSetting.all.order("id ASC")
 
     order=print_query('booking_summary', booking_id)
+
+    shop = Shop.first
+    directory_name = 'public/orders_'+shop.shop_code
+    Dir.mkdir(directory_name) unless File.exists?(directory_name)
+
     # For Print Per Item
     if oqs.cut_per_item
       order.each do|odi|
-        filename = "tmp/order_item_#{booking_id}" + ".pdf"
+        # filename = "tmp/order_item_#{booking_id}" + ".pdf"
+        filename = directory_name + "/order_item_#{booking_id}" + ".pdf"
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
@@ -222,7 +242,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
+      # filename = "tmp/booking_summary_#{booking_id}" + ".pdf" 
+      filename = directory_name + "/booking_summary_#{booking_id}" + ".pdf"  
       pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty)
 
       if !print_setting.empty?
@@ -261,6 +282,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         end
       end
     end
+    return filename, booking_id, oqs.printer_name
   end
 
   # Query for OQS with status