merge origin master

2017-06-23 17:53:53 +06:30
parent a996ccc7ee 81c50f220a
commit e01ecc6e0f
8 changed files with 177 additions and 37 deletions
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -20,8 +20,6 @@ class DiningFacility < ApplicationRecord

  def get_booking
    booking = self.get_current_booking
-    puts "is bookig?"
-    puts booking
    if booking
      if booking.dining_facility_id.to_i == self.id
        if booking.booking_status == 'assign'