From 0872ce50510a44b9448c1d8a7315d081d832b6be Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Fri, 28 Jun 2019 14:36:21 +0630 Subject: [PATCH] fix conflict --- app/pdf/receipt_bill_pdf.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index d6c1fc13..4d1bd875 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -4,13 +4,9 @@ class ReceiptBillPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move -<<<<<<< HEAD - def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,other_charges_amount,latest_order_no,card_balance_amount) -======= def initialize(printer_settings, kbz_pay_status, qr_code, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,other_charges_amount,latest_order_no,card_balance_amount) ->>>>>>> 29ef6c17f910e846500d77b9f91268cb710b3a64 self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height self.header_font_size = printer_settings.header_font_size.to_i @@ -109,13 +105,10 @@ class ReceiptBillPdf < Prawn::Document shop_note(shop_details) end -<<<<<<< HEAD -======= if kbz_pay_status kbzpay_qr_generator(printed_status, qr_code) end ->>>>>>> 29ef6c17f910e846500d77b9f91268cb710b3a64 footer(printed_status) end