pull from master
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
<% if table.get_checkout_booking.nil? %>
|
||||
<div class="card tables red text-white" data-id="<%= table.id %>" data-name="<%= table.name %>">
|
||||
<% else %>
|
||||
<div class="card tables orange text-white" data-id="<%= table.id %>">
|
||||
<div class="card tables orange text-white" data-id="<%= table.id %>" data-name=" <%= table.name %>">
|
||||
<% end %>
|
||||
<div class="card-block">
|
||||
<%= table.name %>
|
||||
@@ -34,9 +34,9 @@
|
||||
</div>
|
||||
<% else %>
|
||||
<% if table.get_checkout_booking.nil? %>
|
||||
<div class="card tables blue text-white" data-id="<%= table.id %>">
|
||||
<div class="card tables blue text-white" data-id="<%= table.id %>" data-name=" <%= table.name %>">
|
||||
<% else %>
|
||||
<div class="card tables orange text-white" data-id="<%= table.id %>">
|
||||
<div class="card tables orange text-white" data-id="<%= table.id %>" data-name=" <%= table.name %>">
|
||||
<% end %>
|
||||
<div class="card-block">
|
||||
<%= table.name %>
|
||||
@@ -351,7 +351,7 @@ end
|
||||
var dining_name = $(this).attr("data-name");
|
||||
var dining_id = $(this).attr("data-id");
|
||||
var change_from = "<%= @dining.id %>";
|
||||
if ((dining_id == change_from) || (dining_name==undefined)) {
|
||||
if (dining_id == change_from) {
|
||||
swal({
|
||||
title: "Alert!!",
|
||||
text: 'Please select another table !',
|
||||
|
||||
Reference in New Issue
Block a user