git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calculate induties in bill

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-06-19 17:12:44 +06:30
parent 4ef7eef803
commit f7213b1213
13 changed files with 146 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/dining_charge.rb
View File

@@ -8,6 +8,7 @@ class DiningCharge < ApplicationRecord
block_count = 0
price = 0
minutes = DiningCharge.time_diff(checkout, checkin)
checkin_minutes =minutes
free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.utc.strftime('%H:%M'))
dining_minutes = minutes #- free_time # stayminutes - free minutes
if dining_minutes <= free_time
@@ -20,7 +21,7 @@ class DiningCharge < ApplicationRecord
block_count, price = DiningCharge.charges(dining_charges_obj, dining_minutes, 'day')
end
end
return block_count, price
return block_count, price ,checkin_minutes
else
puts "<<<<<<<< NO"
end
@@ -34,7 +35,6 @@ class DiningCharge < ApplicationRecord
charge_block = DiningCharge.convert_to_minutes(chargesObj.charge_block.utc.strftime('%H:%M'))
result = dining_minutes / charge_block
rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M'))
if result.to_i < 1
# for dining minute is under charge_block