From b826b479cdd05aea3493f56005dac2398d77d212 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 19 Jun 2017 12:07:43 +0630
Subject: [PATCH] update for oqs print

---
 app/models/printer/order_queue_printer.rb | 16 ++++++++--------
 app/pdf/order_item_pdf.rb                 |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index dae1ad53..f0b3d576 100644
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -6,12 +6,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     #Print
     order_item=  print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)    
     pdf = OrderItemPdf.new(order_item[0])
-    pdf.render_file "tmp/receipt.pdf"
+    pdf.render_file "tmp/order_item.pdf"
     if oqs.print_copy
-      self.print("tmp/receipt.pdf", oqs.printer_name)
-      self.print("tmp/receipt.pdf", oqs.printer_name)
+      self.print("tmp/order_item.pdf", oqs.printer_name)
+      self.print("tmp/order_item.pdf", oqs.printer_name)
     else
-      self.print("tmp/receipt.pdf", oqs.printer_name)
+      self.print("tmp/order_item.pdf", oqs.printer_name)
     end    
   end
 
@@ -24,12 +24,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     if oqs.cut_per_item
       order.each do|odi|
         pdf = OrderItemPdf.new(odi)
-        pdf.render_file "tmp/receipt.pdf"
+        pdf.render_file "tmp/order_item.pdf"
         if oqs.print_copy
-          self.print("tmp/receipt.pdf", oqs.printer_name)
-          self.print("tmp/receipt.pdf", oqs.printer_name)
+          self.print("tmp/order_item.pdf", oqs.printer_name)
+          self.print("tmp/order_item.pdf", oqs.printer_name)
         else
-          self.print("tmp/receipt.pdf", oqs.printer_name)
+          self.print("tmp/order_item.pdf", oqs.printer_name)
         end 
       end
     # For Print Order Summary
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 96008dfd..dd223e49 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -71,7 +71,7 @@ class OrderItemPdf < Prawn::Document
     add_order_items(order_item)
 
     dash(1, :space => 1, :phase => 1)
-    stroke_horizontal_line 0, self.page_width
+    stroke_horizontal_line 0, (self.page_width - self.margin)
     move_down 5
   end