git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add oqs for movetable

Browse Source
This commit is contained in:
phyusin
2018-09-10 10:00:35 +06:30
parent 2fcafcd351
commit b8680e8b6b
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/models/order_queue_station.rb
View File

@@ -238,7 +238,7 @@ class OrderQueueStation < ApplicationRecord
AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true) AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
else 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
end end
@@ -281,12 +281,12 @@ class OrderQueueStation < ApplicationRecord
assigned =AssignedOrderItem.where("order_id = '#{ order.order_id }'").pluck(:assigned_order_item_id) 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) AssignedOrderItem.where('assigned_order_item_id IN (?)', assigned).update_all(print_status: true)
else 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
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 if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
# get printer info # get printer info
@from = (DiningFacility.find(change_from)).name @from = (DiningFacility.find(change_from)).name
@@ -296,18 +296,18 @@ class OrderQueueStation < ApplicationRecord
@date = DateTime.now @date = DateTime.now
@shop = Shop.first @shop = Shop.first
unique_code = "MoveTablePdf" unique_code = "MoveTablePdf"
pdf_no = PrintSetting.where(:unique_code => unique_code).count # pdf_no = PrintSetting.where(:unique_code => unique_code).count
#print_settings = PrintSetting.find_by_unique_code(unique_code) print_settings = PrintSetting.find_by_unique_code(unique_code)
printer_array = [] # printer_array = []
printer_array = PrintSetting.where(:unique_code => unique_code) # printer_array = PrintSetting.where(:unique_code => unique_code)
for i in 0..pdf_no # for i in 0..pdf_no
if i != pdf_no # if i != pdf_no
print_settings = printer_array[i] # print_settings = printer_array[i]
printer = Printer::ReceiptPrinter.new(print_settings) printer = Printer::ReceiptPrinter.new(print_settings)
printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items) printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items,oqs)
end # end
end # end
end end
end end
end end

13
app/models/printer/receipt_printer.rb
View File

@@ -266,13 +266,22 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
end end
#Move Table Print #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 #Use CUPS service
#Generate PDF #Generate PDF
#Print #Print
pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by,order_items)
pdf.render_file "tmp/print_move_table.pdf" 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 end
#Bill Receipt Print #Bill Receipt Print