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

update move table

Browse Source
This commit is contained in:
Aung Myo
2018-06-13 13:43:02 +06:30
parent 676ec4d611
commit f41b882730
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/origami/moveroom/move_dining.html.erb
View File

@@ -35,9 +35,9 @@
</div> </div>
<% else %> <% else %>
<% if table.get_checkout_booking.nil? %> <% 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 %> <% 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 %> <% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>

9
app/views/origami/movetable/move_dining.html.erb
View File

@@ -34,9 +34,9 @@
</div> </div>
<% else %> <% else %>
<% if table.get_checkout_booking.nil? %> <% 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 %> <% 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 %> <% end %>
<div class="card-block"> <div class="card-block">
<%= table.name %> <%= table.name %>
@@ -351,7 +351,10 @@ end
var dining_name = $(this).attr("data-name"); var dining_name = $(this).attr("data-name");
var dining_id = $(this).attr("data-id"); var dining_id = $(this).attr("data-id");
var change_from = "<%= @dining.id %>"; var change_from = "<%= @dining.id %>";
if ((dining_id == change_from) || (dining_name==undefined)) { console.log(dining_id);
console.log(change_from);
console.log(dining_name);
if ((dining_id == change_from)) {
swal({ swal({
title: "Alert!!", title: "Alert!!",
text: 'Please select another table !', text: 'Please select another table !',