diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 64638d0f..5c314387 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -74,7 +74,8 @@ class Api::OrdersController <  Api::ApiController
     else
       if checkin_checkout_time(params[:booking_id])
 
-        table = DiningFacility.find(params[:table_id]) if params[:table_id].present?
+        table = DiningFacility.find_by_name(params[:table_name]) if params[:table_name].present?
+        # table = DiningFacility.find(params[:table_id]) if params[:table_id].present?
 
         booking = table.current_checkin_booking if table
         booking ||= Booking.find(params[:booking_id]) if params[:booking_id].present?
@@ -107,7 +108,7 @@ class Api::OrdersController <  Api::ApiController
                                 customer_id: params[:customer_id].present? ? params[:customer_id] : Customer.walkin.customer_id, # for no customer id from mobile
                                 items: items_arr,
                                 guest: params[:guest_info],
-                                table_id: params[:table_id],
+                                table_id: !table.nil? ? table.id : '',
                                 new_booking: true,
                                 waiters: @user.name,
                                 employee_name: @user.name,
@@ -132,7 +133,8 @@ class Api::OrdersController <  Api::ApiController
           end
         end
       else
-        return return_json_status_with_code(406, "Checkout time is over!")
+        @status  =false
+        @message ="Checkout time is over!"
       end
     end
   end
diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb
index c0051e23..646c0d7b 100755
--- a/app/controllers/api/payments_controller.rb
+++ b/app/controllers/api/payments_controller.rb
@@ -130,7 +130,7 @@ class Api::PaymentsController < Api::ApiController
               other_amount = SaleItem.calculate_other_charges(sale_items)
 
               printer = Printer::ReceiptPrinter.new(print_settings)
-              filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,sale,params[:card_no], item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, 'Foodcourt',current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil,transaction_ref)
+              filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,sale,params[:card_no], item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,@shop, 'Paid',current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil,transaction_ref)
             render json: JSON.generate({:status => true, :balance_amount => card_balance_amount,:receipt_no => sale.receipt_no,:order_no => latest_order_no, :message => "complete", :paid_amount => sale.grand_total})
           end
         end
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 551d7527..b1ff0dc8 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -43,7 +43,16 @@ class ReceiptBillA5Pdf < Prawn::Document
 
     header(shop_details)
     if sale_data.orders[0].source =='app'
-      text "Mobile Order", :size => self.header_font_size,:align => :left
+      move_down 3
+      y_position = cursor
+      bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+          text "Mobile Order", :size => self.header_font_size,:align => :left
+      end
+      if !sale_data.bookings[0].dining_facility.nil?
+        bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+          text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+        end
+      end
       move_down 1
       text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
       move_down 1
diff --git a/app/pdf/receipt_bill_order_pdf.rb b/app/pdf/receipt_bill_order_pdf.rb
index 2f4efc5f..b3c8b24e 100644
--- a/app/pdf/receipt_bill_order_pdf.rb
+++ b/app/pdf/receipt_bill_order_pdf.rb
@@ -44,7 +44,16 @@ class ReceiptBillOrderPdf < Prawn::Document
 
         header(shop_details)
         if sale_data.orders[0].source =='app'
-          text "Mobile Order", :size => self.header_font_size,:align => :left
+          move_down 3
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+              text "Mobile Order", :size => self.header_font_size,:align => :left
+          end
+          if !sale_data.bookings[0].dining_facility.nil?
+            bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+              text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+            end
+          end
           move_down 1
           text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
           move_down 1
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index e8fd36b5..bfeb6e98 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -46,13 +46,16 @@ class ReceiptBillPdf < Prawn::Document
 
         header(shop_details)
         if sale_data.orders[0].source =='app'
+          move_down 3
           y_position = cursor
           bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
               text "Mobile Order", :size => self.header_font_size,:align => :left
           end
-          bounding_box([self.description_width - 2,y_position], :width => self.price_num_width) do
-            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
-         end
+          if !sale_data.bookings[0].dining_facility.nil?
+            bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+              text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+            end
+          end
           move_down 1
           text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
           move_down 1
@@ -72,7 +75,7 @@ class ReceiptBillPdf < Prawn::Document
         else
           customer(customer_account,nil)
         end
-        
+
         #start card sale trans data
         if card_data != nil
             card_sale_data(card_data)
diff --git a/app/pdf/receipt_bill_star_pdf.rb b/app/pdf/receipt_bill_star_pdf.rb
index 0463bfd1..a7c65b09 100644
--- a/app/pdf/receipt_bill_star_pdf.rb
+++ b/app/pdf/receipt_bill_star_pdf.rb
@@ -45,7 +45,16 @@ class ReceiptBillStarPdf < Prawn::Document
 
         header(shop_details)
         if sale_data.orders[0].source =='app'
-          text "Mobile Order", :size => self.header_font_size,:align => :left
+          move_down 3
+          y_position = cursor
+          bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+              text "Mobile Order", :size => self.header_font_size,:align => :left
+          end
+          if !sale_data.bookings[0].dining_facility.nil?
+            bounding_box([0,y_position], :width =>self.description_width + self.price_num_width) do
+              text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.header_font_size,:align => :right,:style=>:bold
+            end
+          end
           move_down 1
           text "Customer Ph : #{sale_data.customer.contact_no}", :size => self.header_font_size,:align => :left
           move_down 1