fixed conflict

2017-06-07 22:29:43 +06:30
parent fd1c53432c f9c8dbc03e
commit 44382d284f
52 changed files with 746 additions and 249 deletions
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -64,12 +64,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    self.print(filename)
  end
 #Bill Receipt Print
-  def print_receipt_bill(printer_settings,sale_items,sale,sale_data)
+  def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name)
    #Use CUPS service
    #Generate PDF
    #Print
-    pdf = ReceiptBillPdf.new(printer_settings,sale_items,sale,sale_data)
-        pdf.render_file "tmp/receipt_bill.pdf"
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name)
+    pdf.render_file "tmp/receipt_bill.pdf"
    self.print("tmp/receipt_bill.pdf")
  end