Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty

2017-06-09 02:40:48 +06:30
parent c23f726cb3 75c8936eff
commit 5f5e6470c7
16 changed files with 221 additions and 112 deletions
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -48,7 +48,7 @@ class Order < ApplicationRecord
      process_order_queue

      #send order to broadcast job
-      send_order_broadcast
+      #send_order_broadcast

      return true, booking

--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -74,11 +74,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
  end

  #Bill Receipt Print
-  def print_crm_order(booking,setting)
+  def print_crm_order(booking,order_items,setting)
    #Use CUPS service
    #Generate PDF
    #Print
-    pdf = CrmOrderPdf.new(booking,setting)
+    pdf = CrmOrderPdf.new(booking,order_items,setting)
        pdf.render_file "tmp/print_crm_order.pdf"
    self.print("tmp/print_crm_order.pdf")
  end