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

fix timezone - time with local timezone to default timezone

Browse Source
This commit is contained in:
pyaephyoeaung
2022-05-19 14:20:55 +06:30
parent 7598a96e60
commit 214712fd2d
48 changed files with 294 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,9 +30,9 @@ class Settings::DiningChargesController < ApplicationController
def create
@dining_charge = DiningCharge.new(dining_charge_params)
@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"])
@dining_charge.minimum_free_time = Time.zone.parse(dining_charge_params["minimum_free_time"])
@dining_charge.charge_block = Time.zone.parse(dining_charge_params["charge_block"])
@dining_charge.time_rounding_block = Time.zone.parse(dining_charge_params["time_rounding_block"])
respond_to do |format|
if @dining_charge.save
@@ -54,14 +54,14 @@ 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"])
@dining_charge.minimum_free_time = Time.zone.parse(dining_charge_params["minimum_free_time"])
@dining_charge.charge_block = Time.zone.parse(dining_charge_params["charge_block"])
@dining_charge.time_rounding_block = Time.zone.parse(dining_charge_params["time_rounding_block"])
if @dining_charge.update(dining_charge_params)
@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"])
@dining_charge.minimum_free_time = Time.zone.parse(dining_charge_params["minimum_free_time"])
@dining_charge.charge_block = Time.zone.parse(dining_charge_params["charge_block"])
@dining_charge.time_rounding_block = Time.zone.parse(dining_charge_params["time_rounding_block"])
# @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)
# @dining_charge.time_rounding_block = @dining_charge.time_rounding_block.to_datetime.advance(hours: +6, minutes: +30)