pull origin master

2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -38,7 +38,7 @@
       <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
         <% @tables.each do |table| %>
         <% if table.status == 'occupied' %>
-         <div class="card tables red text-white" data-id="<%= table.id %>">
+         <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
           <div class="card-block">
              <%= table.name %>
              <% if table.get_booking.nil? %>