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

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