Pull from master

2018-05-14 16:00:31 +06:30
parent 11bae95ac6
commit 916dbf2cd3
14 changed files with 173 additions and 139 deletions
--- 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;
    });