fixed conflict

2019-11-15 14:24:54 +06:30
parent 213644d8ef cc8cf0a48c
commit 6bfaea9f34
55 changed files with 1479 additions and 1332 deletions
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -227,8 +227,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
      count = printer_settings.print_copies

      # override print copies for print worker loop
-      print_settings.print_copies = 1
-      print_settings.save!
+      # print_settings.print_copies = 1
+      # print_settings.save!
    end
    directory_name = 'public/receipts'
    Dir.mkdir(directory_name) unless File.exists?(directory_name)