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

parallel incoming req

Browse Source
This commit is contained in:
Yan
2017-10-20 13:25:24 +06:30
parent 4eb9fe74e1
commit 25bc6f1c26
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/application.scss
View File

@@ -62,7 +62,7 @@
} }
section.content { section.content {
margin: 70px 15px 0 225px; margin: 50px 15px 0 225px;
} }
.sidebar { .sidebar {

13
app/controllers/api/orders_controller.rb
View File

@@ -96,7 +96,18 @@ class Api::OrdersController < Api::ApiController
end end
end end
@status, @booking = @order.generate # for parallel order
# i = 0
remoteIP = ""
begin
@status, @booking = @order.generate
# i += 1
puts "RRR"
puts @booking.booking_id
puts request.remote_ip
remoteIP = request.remote_ip
end while request.remote_ip != remoteIP
end end
# render json for http status code # render json for http status code

2
app/views/layouts/_header.html.erb
View File

@@ -32,7 +32,7 @@ Search Bar -->
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<%if current_login_employee.role !="waiter" %> <%if current_login_employee.role !="waiter" %>
<%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %> <%= link_to (t :logout),logout_path, method: :delete,"data-no-turbolink" => true, data: {confirm: 'Are you sure?'} %>
<%end%> <%end%>
<p class="delete" style="" data-ref="<%=logout_path%>" data-method="delete">Logout</p> <p class="delete" style="" data-ref="<%=logout_path%>" data-method="delete">Logout</p>