update oqs

2017-10-23 16:14:29 +06:30
parent 735dc228db
commit 14fc9b1a45
4 changed files with 100 additions and 90 deletions
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -46,72 +46,71 @@ $(document).ready(function(){
    }); //End Click
 
 	function show_details(url){  
-	   var oqs_append = $('.oqs_append');
-	   oqs_append.empty();
-	   var filter = $('.filter').text();
-	  //Start Ajax
-	  $.ajax({      
-	    type: "GET",         
-	    url: url, 
-	    data: {'filter':filter},
-	    dataType: "json",
-	    success: function(data) {
-	        for(var field in data) {
-	          var price = parseFloat(data[field].price).toFixed(2);
+	     var oqs_append = $('.oqs_append');
+	     oqs_append.empty();
+	     var filter = $('.filter').text();
+	    //Start Ajax
+	    $.ajax({      
+	      type: "GET",         
+	      url: url, 
+	      data: {'filter':filter},
+	      dataType: "json",
+	      success: function(data) {
+	          for(var field in data) {
+	            var price = parseFloat(data[field].price).toFixed(2);

-	          if (data[field]["options"] == "[]" || data[field]["options"] == "") {
-	           var options = "";
-	          }else{
-	           var options = data.options;
+	            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
+	             var options = "";
+	            }else{
+	             var 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 animated " data-date="'+data[field]["order_id"]+'">'
+	                    +'<div class="card-block">'
+	                        +'<h6 class="card-">'
+	                          +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
+	                          +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+	                          +'<small class="float-right">'+ data[field]["order_id"] +'</small>'
+	                        +'</h6>'
+
+	                        +'<h6>'
+	                          +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
+	                          +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+	                        +'</h6>'
+
+	                        +'<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);
 	          }
-
-	          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 animated " data-date="'+data[field]["order_id"]+'">'
-	                  +'<div class="card-block">'
-	                      +'<h4 class="card-title">'
-	                        +'<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>'
-	                      +'</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 
-
-	}
+	          
+	       }
+	    });
+	    //end Ajax 
+	  }

 	$(document).on('click', '.queue_station', function(event){ 
 	    var orderZone=$(this).children().children().children('.order-zone').text().trim();
@@ -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();
 	      }
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -663,25 +663,21 @@ $(function(){
      data: params,
      dataType: "json",
      success:function(result){ 
-        $("#loading_wrapper").hide();                         
-        $.confirm({
-          title: 'Infomation!',
-          content: "Order has been successfully created",
-          buttons: {
-            confirm: {
-              text: 'Ok',
-              btnClass: 'btn-green',
-              action: function(){
-                if(table_type == "Table"){
+        $("#loading_wrapper").hide(); 
+        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
-                }
-              }
-            }
-          }
-        });                   
+                }    
+        });                 
      }
    });
  });
--- a/app/assets/stylesheets/reset.css
+++ b/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;
 }
--- a/app/views/oqs/home/index.html.erb
+++ b/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> 
-                  <h4>
+                  </h5> 
+                  <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> -->