diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index a7fec897..84a46622 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -17,6 +17,7 @@ class Origami::HomeController < BaseOrigamiController @status_order = "" @order_items = Array.new @dining.bookings.each do |booking| + if booking.sale_id.nil? booking.booking_orders.each do |booking_order| diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 74e5810e..c5b2b2fc 100644 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -10,9 +10,11 @@ class Origami::MovetableController < BaseOrigamiController @dining = DiningFacility.find(params[:dining_id]) @order_items = Array.new @dining.bookings.each do |booking| + if booking.sale_id.nil? booking.booking_orders.each do |booking_order| + order = Order.find(booking_order.order_id) @obj_order = order @date = order.created_at