diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index a275d420..6e347ada 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -238,7 +238,7 @@ class OrderQueueStation < ApplicationRecord AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true) else - move_print_pdf(change_to,current_user,table_id,order_items) + move_print_pdf(change_to,current_user,table_id,order_items,oqs) end end @@ -281,12 +281,12 @@ class OrderQueueStation < ApplicationRecord assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id) AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true) else - move_print_pdf(change_to,current_user,table_id,assigned_items) + move_print_pdf(change_to,current_user,table_id,assigned_items,oqs) end end - def move_print_pdf(change_to,current_user,change_from,order_items) + def move_print_pdf(change_to,current_user,change_from,order_items,oqs) if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # get printer info @from = (DiningFacility.find(change_from)).name @@ -296,18 +296,18 @@ class OrderQueueStation < ApplicationRecord @date = DateTime.now @shop = Shop.first unique_code = "MoveTablePdf" - pdf_no = PrintSetting.where(:unique_code => unique_code).count - #print_settings = PrintSetting.find_by_unique_code(unique_code) - printer_array = [] - printer_array = PrintSetting.where(:unique_code => unique_code) + # pdf_no = PrintSetting.where(:unique_code => unique_code).count + print_settings = PrintSetting.find_by_unique_code(unique_code) + # printer_array = [] + # printer_array = PrintSetting.where(:unique_code => unique_code) - for i in 0..pdf_no - if i != pdf_no - print_settings = printer_array[i] + # for i in 0..pdf_no + # if i != pdf_no + # print_settings = printer_array[i] printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items) - end - end + printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items,oqs) + # end + # end end end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 607232af..cb516be2 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -266,13 +266,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Move Table Print - def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) + def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by,order_items,oqs) #Use CUPS service #Generate PDF #Print + pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) pdf.render_file "tmp/print_move_table.pdf" - self.print("tmp/print_move_table.pdf") + + if oqs.print_copy + self.print("tmp/print_move_table.pdf",oqs.printer_name) + else + print_settings.print_copies = 1 + print_settings.save! + #no print in cloud server + self.print("tmp/print_move_table.pdf", oqs.printer_name) + end end #Bill Receipt Print