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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-07-17 13:14:03 +06:30
parent ca1bd437cd 26f4715aed
commit ddae25b241
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/dining_charge.rb
View File

@@ -35,16 +35,24 @@ class DiningCharge < ApplicationRecord
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
return 1, result.to_i,chargesObj.unit_price
elsif result.to_i >= 1
if dining_minutes > rounding_time
rounding_block = dining_minutes % rounding_time
solid_price = rounding_block * chargesObj.time_rounding_block_price
return 1, solid_price,chargesObj.unit_price
else
return 1, result.to_i,chargesObj.unit_price
end
elsif result.to_i >= 1
solid_price = result * chargesObj.unit_price
remain_value = dining_minutes % charge_block
rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M'))
# rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M'))
roundingblock = remain_value / rounding_time