From c5dbbea76dae7544bc2aeb2ad108eda58e730c19 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 21 Jul 2017 17:07:31 +0630
Subject: [PATCH] update long bill

---
 app/controllers/origami/movetable_controller.rb | 4 +++-
 app/models/booking.rb                           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 50f2c774..6062216f 100644
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -44,12 +44,14 @@ class Origami::MovetableController < BaseOrigamiController
      change_to = params[:change_to] #new
      change_from = params[:change_from] #original
      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' || booking.booking_status != 'moved'
+       if booking.sale_id.nil? && booking.booking_status != 'moved'
          booking_array.push(booking)
        end
      end
+
      @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
    end
 end
diff --git a/app/models/booking.rb b/app/models/booking.rb
index cc4ae389..e3d94a37 100644
--- a/app/models/booking.rb
+++ b/app/models/booking.rb
@@ -1,4 +1,3 @@
-
 class Booking < ApplicationRecord
   self.primary_key = "booking_id"
 
@@ -14,6 +13,7 @@ class Booking < ApplicationRecord
   def self.update_dining_facility(booking_arr, newd, old)
     table = DiningFacility.find(newd)
     exist = table.get_booking
+
     if exist
       # order exists
       booking_arr.each do |booking|