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

app/assets/javascripts/OQS.js

@@ -122,11 +122,13 @@ $(document).ready(function(){
 
   	// Print Order Summary
   	$('#print_order_summary').on('click',function(){
+  		var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
   		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  		var params = { 'id':assigned_item_id };
+  		var params = { 'table_name':table_name };
   		$.ajax({
 			type: 'GET',
 	     	url: '/oqs/print/print_order_summary/'+assigned_item_id,
+	     	data: params,
 	     	success: function(data){	}
   		});
   	});

app/assets/javascripts/settings/processing_items.js

@@ -40,7 +40,7 @@ $(document).on('turbolinks:load', function() {
       items.push($(value).attr("data-id"));
     });
 
-    $("#order_queue_station_processing_items").val(items);
+    $("#order_queue_station_processing_items").val(JSON.stringify(items));
     //$(this).submit();
   })
 })