merge with master

app/models/printer/order_queue_printer.rb

@@ -12,7 +12,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.pdf" 
+    filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
     # check for item not to show 
     # if order_item[0].price != 0 
@@ -46,14 +46,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     order=print_query('order_summary', order_id)    
     # For Print Per Item
     if oqs.cut_per_item
-      order.each do|odi|
-        filename = "tmp/order_item.pdf"
+
+      order_items.each do|odi|
+        odi_item=print_query('order_item', odi.order_items_id)   
+        filename = "tmp/order_item_#{order_id}" + ".pdf" 
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
           if oqs.print_copy               
@@ -68,7 +70,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/order_summary.pdf"
+      filename = "tmp/order_summary_#{order_id}" + ".pdf"
       pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
       pdf.render_file filename
       if oqs.print_copy
@@ -96,7 +98,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Per Item
     if oqs.cut_per_item
       order.each do|odi|
-        filename = "tmp/order_item.pdf"
+        filename = "tmp/order_item_#{booking_id}" + ".pdf"
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
@@ -120,7 +122,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/booking_summary.pdf"      
+      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"      
       pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
       pdf.render_file filename
       if oqs.print_copy

app/models/printer/receipt_printer.rb

@@ -117,4 +117,15 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     pdf.render_file "tmp/print_crm_order.pdf"
     self.print("tmp/print_crm_order.pdf")
   end
+
+  #Queue No Print
+  def print_call_waiter(printer_settings,table,time,shop_detail)
+    #Use CUPS service
+    #Generate PDF
+    #Print
+    pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail)
+    pdf.render_file "tmp/print_call_waiter.pdf"
+    self.print("tmp/print_call_waiter.pdf")
+  end
+
 end