diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 1731f69c..ecbc94e7 100644
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -6,10 +6,13 @@ class Oqs::PrintController < ApplicationController
     assigned_item=AssignedOrderItem.find(assigned_item_id)  	
     assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
+    # printer for each stations
+    printer_name = assigned_item.order_queue_station.printer_name
+
     # print when complete click 
   	print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-  	order_queue_printer.print_order_item(print_settings,assigned_item.order_id, assigned_item.item_code )
+  	order_queue_printer.print_order_item(printer_name,assigned_item.order_id, assigned_item.item_code )
   	
     # update print status for completed same order items
     assigned_items.each do |ai|
@@ -25,10 +28,13 @@ class Oqs::PrintController < ApplicationController
     assigned_item=AssignedOrderItem.find(assigned_item_id)    
     assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
+    # printer for each stations
+    printer_name = assigned_item.order_queue_station.printer_name
+    
     # print when complete click 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    order_queue_printer.print_order_summary(print_settings,assigned_item.order_id)
+    order_queue_printer.print_order_summary(printer_name,assigned_item.order_id)
 
      # update print status for completed same order items
     assigned_items.each do |ai|
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 9c928593..9b3f5205 100644
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,25 +1,25 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(printer_settings,order_id, item_code)
+  def print_order_item(printer_name,order_id, item_code)
     #Use CUPS service
     #Generate PDF
     #Print
     order_item=  print_query('order_item', item_code) #OrderItem.find_by_item_code(item_code)    
-    pdf = OrderItemPdf.new(order_item[0],printer_settings)
+    pdf = OrderItemPdf.new(order_item[0])
     pdf.render_file "tmp/receipt.pdf"
-    self.print("tmp/receipt.pdf")
+    self.print("tmp/receipt.pdf", printer_name)
   end
 
-  def print_order_summary(printer_settings,order_id)
+  def print_order_summary(printer_name,order_id)
     #Use CUPS service
     #Generate PDF
     #Print
     order=print_query('order_summary',order_id)
     filename = "tmp/order_summary_#{order_id}" + ".pdf"
-    pdf = OrderSummaryPdf.new(order,printer_settings)
+    pdf = OrderSummaryPdf.new(order)
     pdf.render_file filename
 
-    self.print(filename)
+    self.print(filename, printer_name)
   end
 
   # Query for OQS with status
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 01c60ef0..96008dfd 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -1,6 +1,6 @@
 class OrderItemPdf < Prawn::Document
   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
-  def initialize(order_item, print_settings)
+  def initialize(order_item)
     self.page_width = 254
     self.page_height = 1450
     self.margin = 10
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 3ff6663e..47c1f6a5 100644
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -1,6 +1,6 @@
 class OrderSummaryPdf < Prawn::Document
   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
-  def initialize(order, print_settings)
+  def initialize(order)
     self.page_width = 254
     self.page_height = 1450
     self.margin = 10