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

app/assets/javascripts/OQS.js

@@ -17,6 +17,11 @@
 //= require cable
 
 $(document).ready(function(){
+	// auto refresh every 5 seconds
+	setTimeout(function(){
+	   window.location.reload(1);
+	}, 5000);
+
 	$('.queue_station').on('click',function(){    
 	    var orderZone=$(this).children().children().children('.order-zone').text();
 	    var orderItem=$(this).children().children().children('.order-item').text();
@@ -39,7 +44,8 @@ $(document).ready(function(){
 	});
 
   	// complete for queue item
-  	$('.order-complete').on('click',function(){  
+  	$('.order-complete').on('click',function(e){  
+  		//e.preventDefault();
   		var _self = $(this);	// To know in ajax return	
 	    var assigned_item_id=$(this).attr('id').substr(15); 
 	    var params = { 'id':assigned_item_id };
@@ -72,8 +78,10 @@ $(document).ready(function(){
 	      	$("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
 
 	      	alert("updated!");
+	      	// Page reload
+	    	location.reload();
 	      }
-	    });   
+	    });  	    
   	});
 
   	$('#print_order_item').on('click',function(){

app/assets/javascripts/origami.js

@@ -19,8 +19,17 @@
 //= require bootstrap-datepicker
 
 $(document).ready(function(){
+	// auto refresh every 10 seconds
+	setTimeout(function(){
+	   window.location.reload(1);
+	}, 10000);
+
+	// For selected order return
+	var order_status = "";
+	order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim();	
+
 	// Enable/Disable Button
-	control_button("disabled");
+	control_button(order_status);
 
 	$(".orders").on('click', function(){
 		$("#order-sub-total").text('');
@@ -38,10 +47,6 @@ $(document).ready(function(){
 		// Enable/Disable Button
 		control_button(order_status);
 
-		//for customer button
-        $("#customer").removeAttr('disabled');
-
-
 		var customer_id=$(this).find(".customer-id").text();
 		show_customer_details(customer_id);
 
@@ -66,12 +71,15 @@ $(document).ready(function(){
 		    	for (i = 0; i < result.length; i++) {
 		    		var data = JSON.stringify(result[i]);
         			var parse_data = JSON.parse(data);
+        			var show_date = "";
 
         			// Receipt Header
         			receipt_no = result[i].receipt_no;
 			        cashier = result[i].cashier_name;
-			        receipt_date = new Date(result[i].receipt_date);
-			        show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' +  receipt_date.getHours()+ ':' +  receipt_date.getMinutes()
+			        if(result[i].receipt_date != null){
+				        receipt_date = new Date(result[i].receipt_date);
+				        show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' +  receipt_date.getHours()+ ':' +  receipt_date.getMinutes()
+				    }
 
 			        $("#receipt_no").text(receipt_no);
 			        $("#cashier").text(cashier == null ? "" : cashier);
@@ -283,18 +291,21 @@ $(document).ready(function(){
 });
 
 /* Button Control by Status */
-function control_button(order_status){
-	if(order_status=="billed"){
+function control_button(order_status){	
+	if(order_status=="billed"){		 
+		$("#customer").prop('disabled', false);
 		$("#request_bills").prop('disabled', true);
 		$("#discount").prop('disabled', false);
 		$("#pay-bill").prop('disabled', false);
 	}
 	else if(order_status=="new") {
+		$("#customer").prop('disabled', false);
 		$("#request_bills").prop('disabled', false);
 		$("#discount").prop('disabled', true);
 		$("#pay-bill").prop('disabled', true);
 	}
 	else {
+		$("#customer").prop('disabled', true);
 		$("#request_bills").prop('disabled', true);
 		$("#discount").prop('disabled', true);
 		$("#pay-bill").prop('disabled', true);

app/assets/stylesheets/OQS.scss

@@ -16,5 +16,6 @@
 }
 
 .selected-item {
+	color: #fff !important;
 	background-color: blue;
 }