fixed conflict

app/models/account.rb

@@ -2,6 +2,6 @@ class Account < ApplicationRecord
 	validates_presence_of :title, :account_type
 
 	has_many :menu_items
-    # belongs_to :lookup , :class_name => "Lookup" ,:foreign_key => :tax_type
+    # belongs_to :lookup , :class_name => "Lookup"
 
 end

app/models/order.rb

@@ -25,7 +25,7 @@ class Order < ApplicationRecord
     if self.new_booking
       booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
-                                :booking_status => "new" })
+                                :booking_status => "assign" })
     else
       if (self.booking_id.to_i > 0 )
         booking = Booking.find(self.booking_id)

app/models/printer/receipt_printer.rb

@@ -63,4 +63,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
 
     self.print(filename)
   end
+#Bill Receipt Print
+  def print_receipt_bill(printer_settings,sale_items,sale)
+    #Use CUPS service
+    #Generate PDF
+    #Print
+    pdf = ReceiptBillPdf.new(printer_settings,sale_items,sale)
+        pdf.render_file "tmp/receipt_bill_#{sale.id}.pdf"
+    self.print("tmp/receipt_bill_#{sale.id}.pdf")
+  end
 end