Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

2017-08-14 10:19:22 +06:30
parent 646492fbd6 5c2928166d
commit c30d8f15d8
20 changed files with 315 additions and 30 deletions
--- a/app/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -1,2 +1,4 @@
 class DiningCharge < ApplicationRecord
+  belongs_to :table
+  belongs_to :room
 end
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -1,5 +1,6 @@
 class DiningFacility < ApplicationRecord
  belongs_to :zone
+  has_many :dining_charges

  TABLE_TYPE = "Table"
  ROOM_TYPE = "Room"