Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/models/printer/order_queue_printer.rb

@@ -8,7 +8,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     pdf = OrderItemPdf.new(order_item[0])
     pdf.render_file "tmp/receipt.pdf"
     if oqs.print_copy
-      self.print("tmp/receipt.pdf", oqs.printer_name)*2
+      self.print("tmp/receipt.pdf", oqs.printer_name)
+      self.print("tmp/receipt.pdf", oqs.printer_name)
     else
       self.print("tmp/receipt.pdf", oqs.printer_name)
     end    
@@ -25,7 +26,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         pdf = OrderItemPdf.new(odi)
         pdf.render_file "tmp/receipt.pdf"
         if oqs.print_copy
-          self.print("tmp/receipt.pdf", oqs.printer_name)*2
+          self.print("tmp/receipt.pdf", oqs.printer_name)
+          self.print("tmp/receipt.pdf", oqs.printer_name)
         else
           self.print("tmp/receipt.pdf", oqs.printer_name)
         end 
@@ -35,7 +37,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
       pdf = OrderSummaryPdf.new(order)
       pdf.render_file filename
-      self.print(filename, printer_name)
+      self.print(filename, oqs.printer_name)
     end
   end
 

db/seeds.rb

@@ -147,8 +147,8 @@ admin_employee = Employee.create({name: "Waiter", role: "waiter", password: "111
 admin_employee = Employee.create({name: "Waiter 2", role: "waiter", password: "22222", emp_id:"222", created_by: "SYSTEM DEFAULT"})
 admin_employee = Employee.create({name: "Cashier", role: "cashier", password: "33333", emp_id:"333", created_by: "SYSTEM DEFAULT"})
 
-# order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"})
-# order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"})
+order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"})
+order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"})
 request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
 crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"})
 queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "EPSON-TM-T82-S-A"})