upgrade

2017-10-31 18:55:16 +06:30
parent 1fa2d090ab
commit 6fe447c7f3
2 changed files with 1 additions and 16 deletions
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -78,13 +78,7 @@ $(function(){
  //click menu sidebar menu category
  $(".menu_category").on("click", function(){
    var menu_id = $(this).find(".menu-id").text();
-<<<<<<< HEAD
-//    var url = $(this).attr('data-ref');
    var url = "get_menu_category/"+menu_id;
-=======
-    var url = "get_menu_category/"+menu_id;
-    console.log(url)
->>>>>>> 01c4eeca81e1eac7bf7fe5854142a9663e104249
    show_menu_item_list(url); 
  }); 
  //End menu category Click
@@ -408,8 +402,7 @@ $(function(){
        // });
      });
    }
-console.log(instance_attributes);
-console.log("hi")
+
    // selected_arr = []
    // $(selected_item).each(function(i){
    //   $.ajax({