update oqs

app/assets/javascripts/OQS.js

@@ -70,16 +70,16 @@ $(document).ready(function(){
 	             
 	            row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
-	                      +'<h4 class="card-title">'
+	                        +'<h6 class="card-">'
 	                          +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
 	                          +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
-	                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
+	                          +'<small class="float-right">'+ data[field]["order_id"] +'</small>'
-	                      +'</h4>'
+	                        +'</h6>'
 
-	                      +'<h4>'
+	                        +'<h6>'
 	                          +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
-	                        +'<span class="order-qty">'+ data[field]["qty"] +'- </span>'
+	                          +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
-	                      +'</h4>'
+	                        +'</h6>'
 
 	                        +'<p class="card-text item-options">'+ options +'</p>'
 
@@ -110,7 +110,6 @@ $(document).ready(function(){
 	       }
 	    });
 	    //end Ajax 
-
 	  }
 
 	$(document).on('click', '.queue_station', function(event){ 
@@ -198,7 +197,20 @@ $(document).ready(function(){
 	      	// update queue item count in completed station
 	      	$("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
 
-	      	alert("updated!");
+	      	swal({
+		          title: "Infomation !",
+		          text: 'Order has been successfully created',
+		          confirmButtonColor: "green",
+		          confirmButtonText: "Yes!",
+		          closeOnConfirm: false,
+		        }, function () {
+		          if(table_type == "Table"){
+		                  window.location.href = "/origami/table/" + table_id
+		                }
+		                else {
+		                  window.location.href = "/origami/room/" + table_id
+		                }    
+		        });
 	      	// Page reload
 	    	location.reload();
 	      }

app/assets/javascripts/addorder.js

@@ -664,23 +664,19 @@ $(function(){
       dataType: "json",
       success:function(result){ 
         $("#loading_wrapper").hide(); 
-        $.confirm({
+        swal({
-          title: 'Infomation!',
+          title: "Infomation !",
-          content: "Order has been successfully created",
+          text: 'Order has been successfully created',
-          buttons: {
+          confirmButtonColor: "green",
-            confirm: {
+          confirmButtonText: "Yes!",
-              text: 'Ok',
+          closeOnConfirm: false,
-              btnClass: 'btn-green',
+        }, function () {
-              action: function(){
           if(table_type == "Table"){
                   window.location.href = "/origami/table/" + table_id
                 }
                 else {
                   window.location.href = "/origami/room/" + table_id
                 }    
-              }
-            }
-          }
         });                 
       }
     });

app/assets/stylesheets/reset.css

@@ -177,7 +177,9 @@ section.content {
 .hidden{
   display: none !important;
 }
-
+.hide{
+  display: none !important;
+}
 .sidebar .menu .list a {
   padding: 5px 13px;
 }

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

@@ -1,4 +1,4 @@
-<div class="container-fluid">
+
   <div class="page-header">
     <ul class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -13,7 +13,7 @@
   <!-- Column One -->
   <div class="row clearfix">
     <div class="col-lg-8 col-md-8 col-sm-8">  
-      <div class="body">
+      <div class="body p-l-10">
         <%= form_tag oqs_root_path, :method => :get do %>
         <div class="row clearfix">
           <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
@@ -76,26 +76,26 @@
        <div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:">
         <!--- Panel 0 - Completed -->
 
-        <div class="tab-pane fade in active" id="completed" role="tabpanel">
+        <div class="tab-pane in active" id="completed" role="tabpanel">
           <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
             <%   
             @queue_completed_item.each do |qid|                               
               %>
               <div class="card queue_station">
                 <div class="card-block">
-                  <h4 class="card-title">
+                  <h5 class="card-">
                     <span class="order-zone-type"><%= qid.type %> - </span>
                     <span class="order-zone"><%= qid.zone %></span>
                     <small class="pull-right"><%= qid.order_id %></small>
-                  </h4> 
+                  </h5> 
-                  <h4>
+                  <h5>
                     <span class="order-item">
                       <%= qid.item_name %>
                     </span> [x
                     <span class="order-qty">
                       <%= qid.qty %>
                     </span> ]   
-                  </h4>                  
+                  </h5>                  
 
                   <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
 
@@ -187,7 +187,7 @@
     </div>
   </div>
 </div>
-<script type="text/javascript">
+<!-- <script type="text/javascript">
   $(document).ready(function(){
 
   $(".nav-completed").on("click", function(){
@@ -413,4 +413,4 @@
     });
   });
 });
-</script>
+</script> -->