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

2017-10-27 12:03:00 +06:30
parent 0653bfab53 c8ee056312
commit 6b3616f644
2 changed files with 2 additions and 1 deletions
--- a/app/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -5,6 +5,7 @@ class DiningCharge < ApplicationRecord
  def self.amount_calculate(dining_charges_obj, checkin , checkout)
    # note :: the first Charge Block will cost all, the Time rounding block will included in 2nd Charge Block
    if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil?
+      block_count = 0
      price = 0
      minutes = DiningCharge.time_diff(checkout, checkin)
      free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.utc.localtime.strftime('%H:%M'))