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

add alert_time_min in api/checkin and check for waiter login

Browse Source
This commit is contained in:
phyusin
2017-12-27 10:30:22 +06:30
parent 48fb5563f5
commit 3d235f9d69
6 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,17 @@ class Api::CheckInProcessController < Api::ApiController
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")
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time }
lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
alert_time_min = 0
if !lookup_checkout_time.nil?
if lookup_checkout_time[0][0] == 'min'
alert_time_min = (lookup_checkout_time[0][1]).to_i
else
alert_time_min = 15
end
end
render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
else
render :json => { :status => false, :error_message => "No current booking!" }
end

5
app/controllers/home_controller.rb
View File

@@ -3,7 +3,8 @@ class HomeController < ApplicationController
skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]
def index
@employees = Employee.all_emp_except_waiter.order("name asc")
# @employees = Employee.all_emp_except_waiter.order("name asc")
@employees = Employee.all.order("name asc")
@login_form = LoginForm.new()
render "layouts/login_dashboard", layout: false
end
@@ -45,7 +46,7 @@ class HomeController < ApplicationController
elsif @employee.role == "manager"
session[:session_token] = @employee.token_session
redirect_to dashboard_path
elsif @employee.role == "supervisor"
elsif @employee.role == "supervisor" || @employee.role == "waiter"
session[:session_token] = @employee.token_session
redirect_to origami_root_path
elsif @employee.role == "account"