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

app/assets/javascripts/CRM.js

@@ -11,10 +11,11 @@
 // about supported directives.
 
 //= require jquery
+//= require jquery_ujs
+//= require jquery-ui
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require jquery_ujs
 //= require turbolinks
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker

app/assets/javascripts/OQS.js

@@ -100,16 +100,13 @@ $(document).on('turbolinks:load', function() {
 	                    +'</div>'
 
 	                +'</div>'; 
-	                    
-	                   
 	                   
 	              $('.oqs_append').append(row);
-	          }
-	          
+	          }	          
 	       }
 	    });
 	    //end Ajax 
-	  }
+	 }
 
 	$(document).on('click', '.queue_station', function(event){ 
 	    var orderZone=$(this).children().children().children('.order-zone').text().trim();
@@ -156,7 +153,7 @@ $(document).on('turbolinks:load', function() {
 	    $(this).addClass('selected-item');
 	});
 
-		$(document).on('click', '.order-item-edit', function(event){ 
+	$(document).on('click', '.order-item-edit', function(event){ 
 		var _self = $(this);	// To know in ajax return
 	    var assigned_item_id=$(this).attr('id').substr(5);
 	    window.location.href = '/oqs/'+ assigned_item_id  + "/edit"