Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/views/origami/addorders/detail.html.erb

@@ -10,6 +10,7 @@
     <div id="oqs_loading"></div>
   </div>
   <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
+  <input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>">
   <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
         <li class="list-menu">
@@ -568,7 +569,7 @@
       </style>
 
 <script>
-
+    var cashier_type = $('#cashier_type').val();
     jQuery(function(){
       var menus = JSON.parse(localStorage.getItem("menus"));
       if (menus != null) {
@@ -588,30 +589,6 @@
         $("#menu_data").removeClass("hidden");
       }      
 
-      function category_list_template(menu) {
-        row = '<li class="nav-item">'
-                +'<p class="hidden menu-id">'+menu.id+'</p> '
-                +'<a class="nav-link menu_category sub_click first_'+menu.id+'" '
-                +'data-toggle="tab" href="" role="tab" data-id="'+menu.id+'" '
-                +'data-sub-id="'+menu.sub_category+'">'+menu.name+''
-                +'</a>'
-                  +'<ul class="sub_category_list hidden fadeInTop animated" '
-                  +'id="sub_category_list">'
-                  +'</ul>'
-                
-             +' </li>';
-        $(".category_cache_list").append(row);           
-      }
-
-      function menu_list_template(menu) {
-        row = '<li class="nav-item menu_click" data-name="'+menu.name+'" '
-                +' data-id="'+menu.id+'" style="">'
-            +' <a class="nav-link" data-toggle="tab" href="" role="tab"'
-            +' style="text-transform: lowercase;">'+menu.name+'</a>'
-           +'</li>';
-        $(".menu_cache_list").append(row);           
-      } 
-
       function menu_cache_append(menus){
         $("#menu_cache").removeClass("hidden");
         $(".menu_cache_name").text(menus[0]["name"])       
@@ -624,7 +601,7 @@
           if (category[ii]["is_available"]== true){
             if (category[ii]["valid_time"]== true){
               if (category[ii]["parent_id"] == null ){   
-                if(type){
+                if(cashier_type){
                   if (category[ii]["code"].includes("SPL") != true) {
                     category_list_template(category[ii]);
                   }          
@@ -660,10 +637,9 @@
         var dining_id = $(this).attr("data-id");
         var name      = $(this).attr("data-name");
         var type      = $(this).attr("data-type");
-        $('#table_id').val(dining_id)
+        $('#table_id').val(dining_id);
-        $('#table_type').text(type)
+        $('#table_type').text(type);
-        $('.select_table').text(name)
+        $('.select_table').text(name);
-        console.log(type)
       });
 
       $('#pending_order').on('click', function () {
@@ -674,6 +650,7 @@
         var menu_id = $(this).attr("data-id");
         var name = $(this).attr("data-name");
         var menus = JSON.parse(localStorage.getItem("menus"));
+
         if (menus != null) {         
           menu_click_cache_append(name,menus,menu_id);
         }else{
@@ -692,11 +669,9 @@
 
         $(".main_menu").text(name);
         for(var i in menus) {  
-          console.log(menus)
+
-          console.log(menus[i]["id"]);
-          console.log(menus[i]["is_active"]);
-          console.log(menu_id);
           if (menu_id == menus[i]["id"] && menus[i]["is_active"] == true) {
+          
               // menu_list_template(menus[i]);
               var category = menus[i]["categories"];
               
@@ -704,7 +679,7 @@
                 if (category[ii]["is_available"]== true){                    
                   if (category[ii]["valid_time"]== true){
                     if (category[ii]["parent_id"] == null ){   
-                      if(type){
+                      if(cashier_type){                        
                         if (category[ii]["code"].includes("SPL") != true) {
                           category_list_template(category[ii]);
                         }          
@@ -725,6 +700,30 @@
         }
       }
 
+      function category_list_template(menu) {
+        row = '<li class="nav-item">'
+                +'<p class="hidden menu-id">'+menu.id+'</p> '
+                +'<a class="nav-link menu_category sub_click first_'+menu.id+'" '
+                +'data-toggle="tab" href="" role="tab" data-id="'+menu.id+'" '
+                +'data-sub-id="'+menu.sub_category+'">'+menu.name+''
+                +'</a>'
+                  +'<ul class="sub_category_list hidden fadeInTop animated" '
+                  +'id="sub_category_list">'
+                  +'</ul>'
+                
+             +' </li>';
+        $(".category_cache_list").append(row);           
+      }
+
+      function menu_list_template(menu) {
+        row = '<li class="nav-item menu_click" data-name="'+menu.name+'" '
+                +' data-id="'+menu.id+'" style="">'
+            +' <a class="nav-link" data-toggle="tab" href="" role="tab"'
+            +' style="text-transform: lowercase;">'+menu.name+'</a>'
+           +'</li>';
+        $(".menu_cache_list").append(row);           
+      } 
+
       //show menu item list when click menu category
       function show_menu_cat_list(name, url_item){ 
         var menu_list = $('.menu_items_list');

app/views/origami/pending_order/completed_sale.html.erb

@@ -257,21 +257,21 @@ $(document).ready(function(){
       var sale_id = $(this).attr("data-id");
       window.location.href = '/origami/quick_service/completed_sale/' + sale_id;
   })
-  $('#reprint').on('click', function () {
+  // $('#reprint').on('click', function () {
-    var sale_id = $('#sale_id').val();
+  //   var sale_id = $('#sale_id').val();
-    var ajax_url = '/origami/'+ sale_id  + "/reprint"
+  //   var ajax_url = '/origami/'+ sale_id  + "/reprint"
 
-    $.ajax({
+  //   $.ajax({
-      type: "GET",
+  //     type: "GET",
-      url: ajax_url,
+  //     url: ajax_url,
-      success: function (result) {
+  //     success: function (result) {
-        if ($("#server_mode").val() == "cloud") {
+  //       if ($("#server_mode").val() == "cloud") {
-          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+  //         code2lab.printFile(result.filepath.substr(6), result.printer_url);
-          }
+  //         }
-        location.reload();
+  //       location.reload();
-      }
+  //     }
-    });
+  //   });
-  });
+  // });
   $('#back').on('click', function () {
     window.location.href = '/origami/quick_service/pending_order';
   });
@@ -348,7 +348,18 @@ function check_emp_access_code(access_code,type) {
                $('#voidModal').modal('show');
              }else if(type=='reprint'){
                 var sale_id = $('#sale_id').val();
-                window.location.href = '/origami/'+ sale_id  + "/reprint"
+                var ajax_url = '/origami/'+ sale_id  + "/reprint";
+
+                $.ajax({
+                  type: "GET",
+                  url: ajax_url,
+                  success: function (result) {
+                    if ($("#server_mode").val() == "cloud") {
+                      code2lab.printFile(result.filepath.substr(6), result.printer_url);
+                      }
+                    location.reload();
+                  }
+                });
              }
            }else{
              swal("Opps",result.message,"warning")