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

oqs autoprint developing

Browse Source
This commit is contained in:
Yan
2017-06-16 13:44:39 +06:30
parent 58bc13e8b6
commit c40a2c78e7
6 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/oqs/print_controller.rb
View File

@@ -6,13 +6,13 @@ class Oqs::PrintController < ApplicationController
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
# printer for each stations
printer_name = assigned_item.order_queue_station.printer_name
# order queue stations
oqs = assigned_item.order_queue_station
# print when complete click
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(printer_name,assigned_item.order_id, assigned_item.item_code )
order_queue_printer.print_order_item(oqs,assigned_item.order_id, assigned_item.item_code )
# update print status for completed same order items
assigned_items.each do |ai|
@@ -28,13 +28,13 @@ class Oqs::PrintController < ApplicationController
assigned_item=AssignedOrderItem.find(assigned_item_id)
assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
# printer for each stations
printer_name = assigned_item.order_queue_station.printer_name
# order queue stations
oqs = assigned_item.order_queue_station
# print when complete click
print_settings=PrintSetting.find_by_unique_code(unique_code)
order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_summary(printer_name,assigned_item.order_id)
order_queue_printer.print_order_summary(oqs,assigned_item.order_id)
# update print status for completed same order items
assigned_items.each do |ai|

2
app/controllers/settings/order_queue_stations_controller.rb
View File

@@ -71,6 +71,6 @@ class Settings::OrderQueueStationsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def settings_order_queue_station_params
params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
params.require(:order_queue_station).permit(:station_name, :is_active, :auto_print, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
end
end