move table

2017-06-22 16:31:41 +06:30
parent 09252ba055
commit 0c0e44c808
8 changed files with 44 additions and 20 deletions
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -44,7 +44,7 @@ class Origami::MovetableController < BaseOrigamiController
     bookings = Booking.where('dining_facility_id=?',change_from)
     booking_array = Array.new
     bookings.each do | booking |
-       if booking.sale_id.nil? || booking.sale.sale_status != 'completed'
+       if booking.sale_id.nil? || booking.sale.sale_status != 'completed' || booking.booking_status != 'moved'
         booking_array.push(booking)
       end
     end