diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index f4d21724..183e7412 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -64,7 +64,8 @@ $(document).on('turbolinks:load', function() {
 		for (i = 0; i < list.length; i++) {
 		    table_id.push(list[i].value);
 		} 
-       	$('#table_id').val(table_id);
+		 console.log(table_id)
+       	$('#table').val(table_id);
 
         oqs_id = $("#oqs_id").val();
         status = $("#status").val();
@@ -85,7 +86,7 @@ $(document).on('turbolinks:load', function() {
 	       // oqs_id = $(this).find(".oqs-id").text();
 	        $("#oqs_active").attr('data-id',oqs_id);
 	       var url    = 'oqs/get_items/'+oqs_id;
-	       console.log(table)
+	      
 	       show_details(url,table,status);
     	}else{
     		$("#completed").removeClass('hide')
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 654dcaff..aa06d103 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -177,7 +177,7 @@ puts items.to_json
     else
      table = ''
     end
-    
+
     query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, 
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
@@ -215,8 +215,8 @@ puts items.to_json
     .where("assigned_order_items.delivery_status = true  AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
                  .group("assigned_order_items.order_id")
-                 .limit(20)
-                 .order("assigned_order_items.created_at")
+                 .limit(50)
+                 .order("assigned_order_items.created_at desc")
 
 
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
@@ -236,7 +236,7 @@ puts items.to_json
     .where("assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
                  .group("odt.order_items_id")
-                 .order("assigned_order_items.created_at")
+                 .order("assigned_order_items.created_at desc")
 
 
      # completed_order = AssignedOrderItem.group(:order_id).where('delivery_status=true');
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index aef82ecf..2ed70673 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1057,6 +1057,7 @@
     $('#request_bills').click(function () {
       var order_id = $('#save_order_id').attr('data-order');
       var ajax_url = "/origami/" + order_id + "/request_bills";
+      localStorage.setItem("tax_type", "all");
       if(order_id!=undefined && order_id!=null && order_id!=""){
         if($('#request_bills').is(":visible")) {
           $('#request_bills').prop("disabled",true);
@@ -1104,6 +1105,7 @@
         var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %>
         var ajax_url = "/origami/sale/append_order";
         var tax_type = localStorage.getItem("tax_type");
+        console.log(tax_type)
         $.ajax({
             type: "POST",
             url: ajax_url,
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 59546349..a1f4cb80 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -1124,6 +1124,7 @@ $('#request_bills').click(function() {
     if($('#request_bills').is(":visible")) {
       $('#request_bills').prop("disabled",true);
     }
+    localStorage.setItem("tax_type", "all");
     $.ajax({
         type: "GET",
         url: ajax_url,