fixed conflict gem

2017-06-04 16:42:18 +06:30
parent af02a63263
commit d058b1b1b8
3 changed files with 4 additions and 8 deletions
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -23,7 +23,7 @@ class ReceiptBillPdf < Prawn::Document

    header( printer_settings.printer_name, printer_settings.name)
        stroke_horizontal_rule
-    cashier_info(sale.receipt_no,sale.customer.name, sale.receipt_date)
+    cashier_info(sale.receipt_no,sale.customer, sale.receipt_date)
    line_items(sale_items)
    all_total(sale_data)