fixed conflict

2017-08-14 11:32:18 +06:30
parent 6f39a024ca 5c2928166d
commit 1f892fdd3d
21 changed files with 344 additions and 47 deletions
--- a/app/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -1,4 +1,6 @@
 class DiningCharge < ApplicationRecord
+  belongs_to :table
+  belongs_to :room

  def amount_calculate(dining_charges_obj, checkin , checkout)

@@ -31,7 +33,7 @@ class DiningCharge < ApplicationRecord
       remain_value = dining_minutes % minues_per_day
       roundingblock = remain_value / chargesObj.time_rounding_block
       if roundingblock > 1
-         
+
       end
    end
  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"