Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-12-12 10:45:02 +06:30
parent 8298b1aebe e727b8b22e
commit 196746bd4f
2 changed files with 6 additions and 2 deletions
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -369,6 +369,7 @@ class SalePayment < ApplicationRecord
  def table_update_status(sale_obj)
    status = true
    booking = Booking.find_by_sale_id(sale_obj.id)
+
    if booking
      table = DiningFacility.find(booking.dining_facility_id)
      bookings = table.bookings
@@ -377,12 +378,15 @@ class SalePayment < ApplicationRecord
          if tablebooking.sale_id
            if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void'
              status = false
+            else
+              status = true
            end
          else
            status = false
          end
        end
      end
+
      if status
         table.status = "available"
         table.save