check oqs edit in origami
This commit is contained in:
@@ -60,6 +60,7 @@ class Oqs::HomeController < BaseOqsController
|
||||
# Get Order items
|
||||
def get_order_items
|
||||
items = []
|
||||
assigned_items = []
|
||||
order_no = params[:order_no]
|
||||
status = params[:status]
|
||||
# dining = DiningFacility.find_by_name(table_name);
|
||||
@@ -90,6 +91,11 @@ class Oqs::HomeController < BaseOqsController
|
||||
|
||||
if !items.empty?
|
||||
items.each do |item|
|
||||
assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
|
||||
if !assigned_order_items.nil?
|
||||
assigned_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
|
||||
end
|
||||
|
||||
if !item.set_menu_items.nil?
|
||||
instance_item_sets = JSON.parse(item.set_menu_items)
|
||||
arr_instance_item_sets = Array.new
|
||||
@@ -101,7 +107,7 @@ class Oqs::HomeController < BaseOqsController
|
||||
end
|
||||
end
|
||||
end
|
||||
render :json => items.to_json
|
||||
render :json => {'items' => items, 'assigned_order_items' => assigned_items }
|
||||
end
|
||||
|
||||
def get_items_by_oqs
|
||||
|
||||
Reference in New Issue
Block a user