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

fix timezone

Browse Source
This commit is contained in:
Thein Lin Kyaw
2023-02-09 14:55:43 +06:30
parent c580cc731a
commit 944f7a7259
52 changed files with 238 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/api/check_in_process_controller.rb
View File

@@ -40,15 +40,15 @@ class Api::CheckInProcessController < Api::ApiController
lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
if !lookup_checkout_time.empty?
now = Time.current
lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-")
start_time = Time.zone.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
end_time = Time.zone.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
if start_time <= now && now <= end_time
alert_time_min = checkout_time[1].to_i
end
end
now = Time.now.utc
lookup_checkout_time.each do |checkout_time|
arr_time = checkout_time[0].split("-")
start_time = Time.zone.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
end_time = Time.zone.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
if start_time <= now && now <= end_time
alert_time_min = checkout_time[1].to_i
end
end
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
else
render :json => { :status => true }

2
app/controllers/api/shifts_controller.rb
View File

@@ -35,7 +35,7 @@ class Api::ShiftsController < Api::ApiController
@shift = ShiftSale.find_by_id(shift_id)
if !@shift.nil?
if @shift.shift_closed_at.nil?
@shift.shift_closed_at = DateTime.now.utc
@shift.shift_closed_at = Time.current
@shift.closing_balance = closing_balance.to_f
@shift.save