diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 391ba83b..65ea665b 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -17,7 +17,7 @@ <%if @menu.present? %> - <%=menu[0].name%> + <%=@menus[0].name%> <% end%> diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 4712a481..66f21ec2 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -222,9 +222,9 @@ $(function() { }); $(".qs_view").on('click', function() { - if ($('#server_mode').val() != "cloud") { + if ($('#server_mode').val() != "cloud") { document.getElementById('second_view').click(); - } + } window.location.href = '/origami/quick_service'; }); diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2915d3ca..e1b88f85 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1010,7 +1010,13 @@ $('#add_order').on('click', function () { var dining_id = "<%= @dining.id %>"; - + var menus = JSON.parse(localStorage.getItem("menus")); + // if (menus != null) { + // console.log("menu"); + // menu_cache_append(menus); + // }else{ + // $("#menu_data").removeClass("hidden"); + // } window.location.href = '/origami/addorders/' + dining_id; }); diff --git a/config/environments/development.rb b/config/environments/development.rb index 2eda7ecf..d1fddff2 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -55,5 +55,5 @@ Rails.application.configure do config.file_watcher = ActiveSupport::EventedFileUpdateChecker # Set Cable URL - config.action_cable.url = "ws://192.168.1.196:3002/cable" + # config.action_cable.url = "ws://192.168.1.196:3002/cable" end