fixed conflit

2019-07-01 11:17:29 +06:30
parent aca0c390c9 f186ddeed9
commit cdcd4ff59c
7 changed files with 11 additions and 7 deletions
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -104,6 +104,10 @@ class ReceiptBillPdf < Prawn::Document
             shop_note(shop_details)
        end

+        if kbz_pay_status
+            kbzpay_qr_generator(printed_status, qr_code)
+        end
+
        footer(printed_status)
    end