update for addorder and printer
This commit is contained in:
@@ -15,14 +15,14 @@ class OrderQueueStation < ApplicationRecord
|
||||
validates_presence_of :station_name, :printer_name
|
||||
|
||||
def process_order(order, table_id, order_source = nil, pdf_status = nil ,change_to=nil, current_user=nil)
|
||||
oqs_stations = OrderQueueStation.active
|
||||
order_items = order.order_items
|
||||
|
||||
if table_id.to_i > 0
|
||||
# get dining
|
||||
dining = DiningFacility.find(table_id)
|
||||
oqs_by_zones = OrderQueueProcessByZone.where("zone_id=#{dining.zone_id}").pluck(:order_queue_station_id)
|
||||
oqs_stations = oqs_stations.select { |s| oqs_by_zones.include? s.id }
|
||||
oqs_stations = dining.order_queue_stations
|
||||
else
|
||||
oqs_stations = OrderQueueStation.active
|
||||
end
|
||||
|
||||
assigned_order_items = []
|
||||
@@ -30,12 +30,12 @@ class OrderQueueStation < ApplicationRecord
|
||||
|
||||
# ToDo per item per printer
|
||||
oqs_stations.each do |oqs|
|
||||
oqs_order_items = nil
|
||||
oqs_order_items = order_items.select { |i| JSON.parse(oqs.processing_items).include? i.item_code }
|
||||
assigned_order_items += oqs_order_items.map { |i| AssignedOrderItem.new({ order: order, item_code: i.item_code, instance_code: i.item_instance_code, order_queue_station: oqs, print_status: false, delivery_status: false }) }
|
||||
oqs_order_items_by_zones << { oqs: oqs, oqs_order_items: oqs_order_items }
|
||||
|
||||
print_status = false
|
||||
if oqs.auto_print && order_source != "quick_service"
|
||||
print_status = true
|
||||
if oqs_order_items.length > 0
|
||||
if oqs.cut_per_item
|
||||
print_slip_item(oqs, order, oqs_order_items, pdf_status, change_to, current_user, table_id)
|
||||
@@ -44,9 +44,9 @@ class OrderQueueStation < ApplicationRecord
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
assigned_order_items.each(&:save)
|
||||
oqs_order_items.each { |i| AssignedOrderItem.create({ order: order, item_code: i.item_code, instance_code: i.item_instance_code, order_queue_station: oqs, print_status: print_status, delivery_status: false }) }
|
||||
end
|
||||
end
|
||||
|
||||
def pay_process_order_queue (order_id, table_id)
|
||||
@@ -155,13 +155,10 @@ class OrderQueueStation < ApplicationRecord
|
||||
else
|
||||
move_print_pdf(change_to,current_user,table_id,order_items,oqs)
|
||||
end
|
||||
|
||||
AssignedOrderItem.where("order_id = ?", order.order_id).update_all(print_status: true)
|
||||
end
|
||||
|
||||
#Print order_item in 1 slip per item
|
||||
def print_slip_item(oqs, order, assigned_items,pdf_status=nil,change_to=nil,current_user=nil,table_id=nil)
|
||||
|
||||
if pdf_status.nil?
|
||||
# order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
|
||||
# print when complete click
|
||||
@@ -176,8 +173,6 @@ class OrderQueueStation < ApplicationRecord
|
||||
else
|
||||
move_print_pdf(change_to,current_user,table_id,assigned_items,oqs)
|
||||
end
|
||||
|
||||
AssignedOrderItem.where("order_id = ?", order.order_id).update_all(print_status: true)
|
||||
end
|
||||
|
||||
def move_print_pdf(change_to,current_user,change_from,order_items,oqs)
|
||||
|
||||
Reference in New Issue
Block a user