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

change json format and void api

Browse Source
This commit is contained in:
phyusin
2018-10-16 14:35:54 +06:30
parent e4daecfec7
commit 94debfdde9
5 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ class Api::AuthenticateController < Api::ApiController
render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role})
else
terminals = CashierTerminal.available.is_active
render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role, :error_message => "No current shift open for this employee!", :terminals => terminals.to_json})
render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role, :error_message => "No current shift open for this employee!", :terminals => ActiveSupport::JSON.encode(terminals)})
end
else
render json: JSON.generate({:status => false, :error_message => "This employee is not active!"})