merge with august spring but merge fail

app/models/printer/receipt_printer.rb

@@ -74,7 +74,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
 
     # print as print copies in printer setting
     count = printer_settings.print_copies
-    begin 
+    begin
       if count == 1
         pdf.render_file "tmp/receipt_bill_#{sale_data.receipt_no}.pdf"
         self.print("tmp/receipt_bill_#{sale_data.receipt_no}.pdf")
@@ -84,9 +84,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
       end
 
       count -= 1
-    end until count == 0      
+    end until count == 0
   end
 
+   # stock check
+   def print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
+     pdf = StockResultPdf.new(print_settings,stockcheck, stockcheck_items,checker_name, shop_details)
+         pdf.render_file "tmp/print_stock_check_result.pdf"
+     self.print("tmp/print_stock_check_result.pdf")
+   end
+
   #Queue No Print
   def print_queue_no(printer_settings,queue)
     #Use CUPS service