From f41b882730e0f563930aac4eb68ba27c40c9830b Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 13 Jun 2018 13:43:02 +0630 Subject: [PATCH] update move table --- app/views/origami/moveroom/move_dining.html.erb | 4 ++-- app/views/origami/movetable/move_dining.html.erb | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb index 84ad9da9..ebcd318b 100755 --- a/app/views/origami/moveroom/move_dining.html.erb +++ b/app/views/origami/moveroom/move_dining.html.erb @@ -35,9 +35,9 @@ <% else %> <% if table.get_checkout_booking.nil? %> -
+
<% else %> -
+
<% end %>
<%= table.name %> diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index c15aeea8..449a9095 100755 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -34,9 +34,9 @@
<% else %> <% if table.get_checkout_booking.nil? %> -
+
<% else %> -
+
<% end %>
<%= table.name %> @@ -351,7 +351,10 @@ 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)) { + console.log(dining_id); + console.log(change_from); + console.log(dining_name); + if ((dining_id == change_from)) { swal({ title: "Alert!!", text: 'Please select another table !',