Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant

app/views/oqs/home/index.html.erb

@@ -3,7 +3,7 @@
   <div class="col-lg-8 col-md-8 col-sm-8">    
     <!-- Nav tabs -->
     <ul class="nav nav-tabs" role="tablist">
-      <li class="nav-item">
+      <li class="nav-item nav-completed">
         <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
       </li>
 
@@ -17,11 +17,12 @@
         <p class="hidden oqs-id"><%= qsi.id  %></p>
          <a class="nav-link" data-toggle="tab" href="" role="tab" <%= status %>>
             <%= qsi.station_name %>
-            <span class="badge badge-pill badge-default" id=""><%= qsi.assigned_order_items.count %>                
+            <span class="badge badge-pill badge-default" id=""><%= qsi.assigned_order_items.count(:delivery_status) %>                
             </span> 
             <% if qsi.auto_print %>
               <span>(ap)</span>
-            <% end %>       
+            <% end %>  
+            <%= qsi.assigned_order_items.where("delivery_status=0").count %>     
         </a>
       </li>
       <% end %>      
@@ -142,83 +143,3 @@
 
   </div>
 </div>
-<script type="text/javascript">
-$(function(){
-
-  $(".oqs_click").on("click", function(){
-
-    var oqs_id = $(this).find(".oqs-id").text();
-    var url = 'oqs/get_items/'+oqs_id;
-    show_details(url); 
-
-  }); //End Click
- 
-function show_details(url){  
-   var oqs_append = $('.oqs_append');
-   oqs_append.empty();
-
-  //Start Ajax
-  $.ajax({      
-    type: "GET",         
-    url: url, 
-    data: {},
-    dataType: "json",
-    success: function(data) {
-        for(var field in data) {
-          var price = parseFloat(data[field].price).toFixed(2);
-
-          if (data[field]["options"] == "[]") {
-            options = "";
-          }else{
-            options = data.options;
-          }
-
-          var date = new Date(data[field]["created_at"]); 
-          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();       
-           
-          row ='<div class="card queue_station">'
-                  +'<div class="card-block">'
-                      +'<h4 class="card-title">'
-                        +'<span class="order-zone-type">'+data[field]["zone"]+'- </span>'
-                        +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
-                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
-                      +'</h4>'
-
-                      +'<h4>'
-                        +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
-                        +'<span class="order-qty">'+ data[field]["qty"] +'- </span>'
-                      +'</h4>'
-
-                      +'<p class="card-text item-options">'+ options +'</p>'
-
-                      +'<p class="card-text">'
-                        +'<small class="text-muted">Order at'
-                          +'<span class="order-at">'+ show_date +'</span> - '
-
-                          +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
-                          +'</small> '
-                      +'</p>'
-
-                      +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
-                      +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
-                  +'</div>'
-
-                  +'<div class="card-footer">'
-                      +'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
-                      +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
-                  +'</div>'
-
-              +'</div>'; 
-                  
-                 
-                 
-            $('.oqs_append').append(row);
-        }
-        
-     }
-  });
-  //end Ajax 
-
-}
-});
-</script>