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

change assigned item id to order item id

Browse Source
This commit is contained in:
phyusin
2018-02-26 10:01:35 +06:30
parent d287ab267d
commit 8b064a4428
3 changed files with 25 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/origami/home_controller.rb
View File

@@ -62,7 +62,7 @@ class Origami::HomeController < BaseOrigamiController
@dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved'
@order_items = Array.new
@assigned_order_items = Array.new
# @assigned_order_items = Array.new
if booking.booking_orders.empty?
@booking = booking
else
@@ -85,10 +85,10 @@ class Origami::HomeController < BaseOrigamiController
item.set_menu_items = arr_instance_item_sets
end
@order_items.push(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_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
end
# 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_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
# end
end
accounts = @customer.tax_profiles
puts accounts.to_json