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

Merge branch 'master' into license

Browse Source
This commit is contained in:
Yan
2017-11-10 11:30:05 +06:30
parent 9c50e1486f b82099368f
commit fb64041a3f
21 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/home_controller.rb
View File

@@ -55,7 +55,7 @@ class HomeController < ApplicationController
render :index
end
else
redirect_to origami_root_path, :notice => "Username and Password dosn't match!"
redirect_to origami_root_path, :notice => "Username and Password doesn't match!"
end
end

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)