add shift id in authenticate and remove session token for close shift

This commit is contained in:
phyusin
2018-10-18 10:21:35 +06:30
parent 2859dcda34
commit 72cc466165
4 changed files with 15 additions and 12 deletions

View File

@@ -28,6 +28,7 @@ class Api::AuthenticateController < Api::ApiController
shift = ShiftSale.current_open_shift(@employee.id)
if !shift.nil?
@status = true
@shift_id = shift.id
# render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role})
else
@status = true

View File

@@ -44,7 +44,7 @@ class Api::ShiftsController < Api::ApiController
cashier_terminal.is_currently_login = 0
cashier_terminal.save
logout_status = Employee.logout(params[:session_token])
logout_status = Employee.logout(current_token)
if logout_status
render json: JSON.generate({:status => true, :message => "Shift successfully close."})
else