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

2017-06-16 09:43:05 +06:30
parent 9a93f2e622 d92a0b0378
commit 2fe8f77bac
23 changed files with 383 additions and 232 deletions
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -19,9 +19,9 @@

 $(document).ready(function(){
 	// auto refresh every 10 seconds
-	setTimeout(function(){
-	   window.location.reload(1);
-	}, 10000);
+	// setTimeout(function(){
+	//    window.location.reload(1);
+	// }, 10000);

 	$('.queue_station').on('click',function(){    
 	    var orderZone=$(this).children().children().children('.order-zone').text();