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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-12-08 14:59:49 +06:30
parent c8767dae99 3dce4ccd10
commit 33326931e2
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,18 +8,11 @@ class Api::CheckInProcessController < Api::ApiController
check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time } render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time }
else
sale_booking = dining_facility.get_current_checkout_booking
if !sale_booking.nil?
check_in_time = sale_booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
check_out_time = sale_booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time }
else else
render :json => { :status => false, :error_message => "No current booking!" } render :json => { :status => false, :error_message => "No current booking!" }
end end
end end
end end
end
def check_in_process def check_in_process
if params[:dining_id] if params[:dining_id]