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

change json format

Browse Source
This commit is contained in:
phyusin
2018-10-16 15:40:50 +06:30
parent 94debfdde9
commit b8f96a1f87
6 changed files with 108 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,26 +20,35 @@ class Api::AuthenticateController < Api::ApiController
def create_cashier
emp_id = params[:emp_id]
password = params[:password]
@terminals = []
if emp_id && password
@employee = Employee.login(emp_id, password)
if @employee && @employee.role == "cashier"
if @employee.is_active
shift = ShiftSale.current_open_shift(@employee.id)
if !shift.nil?
render json: JSON.generate({:status => true, :session_token => @employee.token_session, :name => @employee.name, :role => @employee.role})
@status = true
# 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 => ActiveSupport::JSON.encode(terminals)})
@status = true
@terminals = CashierTerminal.available.is_active
@error_message = "No current shift open for this employee!"
# 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})
end
else
render json: JSON.generate({:status => false, :error_message => "This employee is not active!"})
@status = false
@error_message = "This employee is not active!"
# render json: JSON.generate({:status => false, :error_message => "This employee is not active!"})
end
else
render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."})
@status = false
@error_message = "Bad Emp_ID or Password!"
# render json: JSON.generate({:status => false, :error_message => "Bad Emp_ID or Password."})
end
else
render json: JSON.generate({:status => false, :error_message => "Input Parameters missing."})
@status = false
@error_message = "Input Parameters missing!"
# render json: JSON.generate({:status => false, :error_message => "Input Parameters missing."})
end
end

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

@@ -124,9 +124,6 @@ class Api::BillController < Api::ApiController
end
def request_bill
puts "order items"
puts params[:order_items]
if params[:order_items]
is_extra_time = false
extra_time = ''
@@ -178,15 +175,22 @@ class Api::BillController < Api::ApiController
end
end
# Promotion.promo_activate(@sale)
render json: JSON.generate({:status => true, :sale_id => @sale_id, :sale_data => ActiveSupport::JSON.encode(@sale_data)})
@status = true
# render json: JSON.generate({:status => true, :sale_id => @sale_id, :sale_data => @sale_data.to_json })
else
render json: JSON.generate({:status => false, :error_message => "No Current Open Shift!"})
@status = false
@error_message = "No Current Open Shift!"
# render json: JSON.generate({:status => false, :error_message => "No Current Open Shift!"})
end
else
render json: JSON.generate({:status => false, :error_message => "Create order failed, some error occurred!"})
@status = false
@error_message = "Create order failed, some error occurred!"
# render json: JSON.generate({:status => false, :error_message => "Create order failed, some error occurred!"})
end
else
render json: JSON.generate({:status => false, :error_message => "Parameters missing!"})
@status = false
@error_message = "Parameters missing!"
# render json: JSON.generate({:status => false, :error_message => "Parameters missing!"})
end
end

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

@@ -17,9 +17,13 @@ class Api::ShiftsController < Api::ApiController
@shift_sale = ShiftSale.new
if @shift_sale.create(opening_balance,cashier_terminal_param, current_login_employee)
render json: JSON.generate({:status => true, :message => "Cashier Terminal successfully signin.", :shift => ActiveSupport::JSON.encode(@shift_sale)})
@status = true
@message = "Cashier Terminal successfully signin."
# render json: JSON.generate({:status => true, :message => "Cashier Terminal successfully signin.", :shift => ActiveSupport::JSON.encode(@shift_sale)})
else
render json: JSON.generate({:status => false, :error_message => "Some error occurred!"})
@status = false
@error_message = "Some error occurred!"
# render json: JSON.generate({:status => false, :error_message => "Some error occurred!"})
end
end
end