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

fix edit dining charges

Browse Source
This commit is contained in:
Yan
2017-11-10 11:29:45 +06:30
parent e5f1a44551
commit b82099368f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/settings/dining_charges_controller.rb
View File

@@ -17,7 +17,7 @@ class Settings::DiningChargesController < ApplicationController
def new
@dining_charge = DiningCharge.new
@dining_charge.minimum_free_time = "00:15:00".to_datetime
@dining_charge.charge_block= "02:00:00".to_datetime
@dining_charge.charge_block= "01:00:00".to_datetime
@dining_charge.time_rounding_block="00:15:00".to_datetime
end
@@ -54,6 +54,9 @@ class Settings::DiningChargesController < ApplicationController
def update
respond_to do |format|
@dining_charge.dining_facility_id = @settings_dining_facility.id
@dining_charge.minimum_free_time = DateTime.parse(dining_charge_params["minimum_free_time"])
@dining_charge.charge_block = DateTime.parse(dining_charge_params["charge_block"])
@dining_charge.time_rounding_block = DateTime.parse(dining_charge_params["time_rounding_block"])
if @dining_charge.update(dining_charge_params)
# @dining_charge.minimum_free_time = @dining_charge.minimum_free_time.to_datetime.advance(hours: +6, minutes: +30)
# @dining_charge.charge_block = @dining_charge.charge_block.to_datetime.advance(hours: +6, minutes: +30)

2
app/models/dining_charge.rb
View File

@@ -46,7 +46,7 @@ class DiningCharge < ApplicationRecord
# no time rounding block
return result.to_i, DiningCharge.check_rounding(chargesObj, solid_price, roundingblock)
else
solid_price += roundingblock * chargesObj.time_rounding_block_price
solid_price += (roundingblock * chargesObj.time_rounding_block_price)
return result.to_i, DiningCharge.check_rounding(chargesObj, solid_price, roundingblock)
end
end