diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index ecbc94e7..9fc2a2d7 100644
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -6,13 +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
+    # order queue stations
+    oqs = assigned_item.order_queue_station
 
     # 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(printer_name,assigned_item.order_id, assigned_item.item_code )
+  	order_queue_printer.print_order_item(oqs,assigned_item.order_id, assigned_item.item_code )
   	
     # update print status for completed same order items
     assigned_items.each do |ai|
@@ -28,13 +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
+    # order queue stations
+    oqs = assigned_item.order_queue_station
     
     # 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(printer_name,assigned_item.order_id)
+    order_queue_printer.print_order_summary(oqs,assigned_item.order_id)
 
      # update print status for completed same order items
     assigned_items.each do |ai|
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index e8b9bbe0..408519d2 100644
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -71,6 +71,6 @@ class Settings::OrderQueueStationsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_order_queue_station_params
-      params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
+      params.require(:order_queue_station).permit(:station_name, :is_active, :auto_print, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
     end
 end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 9b3f5205..57a819c9 100644
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -1,25 +1,42 @@
 class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
-  def print_order_item(printer_name,order_id, item_code)
+  def print_order_item(oqs,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])
     pdf.render_file "tmp/receipt.pdf"
-    self.print("tmp/receipt.pdf", printer_name)
+    if oqs.print_copy
+      self.print("tmp/receipt.pdf", oqs.printer_name)*2
+    else
+      self.print("tmp/receipt.pdf", oqs.printer_name)
+    end    
   end
 
-  def print_order_summary(printer_name,order_id)
+  def print_order_summary(oqs,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)
-    pdf.render_file filename
-
-    self.print(filename, printer_name)
+    # For Print Per Item
+    if oqs.cut_per_item
+      order.each do|odi|
+        pdf = OrderItemPdf.new(odi)
+        pdf.render_file "tmp/receipt.pdf"
+        if oqs.print_copy
+          self.print("tmp/receipt.pdf", oqs.printer_name)*2
+        else
+          self.print("tmp/receipt.pdf", oqs.printer_name)
+        end 
+      end
+    # For Print Order Summary
+    else      
+      filename = "tmp/order_summary_#{order_id}" + ".pdf"
+      pdf = OrderSummaryPdf.new(order)
+      pdf.render_file filename
+      self.print(filename, printer_name)
+    end
   end
 
   # Query for OQS with status
diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index db7ed5fd..bc76f044 100644
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -4,6 +4,7 @@
   <div class="form-inputs">
     <%= f.input :station_name %>
     <%= f.input :is_active %>
+    <%= f.input :auto_print %>
     <%= f.input :printer_name %>
     <%= f.input :font_size %>
     <%= f.input :print_copy %>
diff --git a/app/views/settings/order_queue_stations/index.html.erb b/app/views/settings/order_queue_stations/index.html.erb
index 03da3c23..287fb10b 100644
--- a/app/views/settings/order_queue_stations/index.html.erb
+++ b/app/views/settings/order_queue_stations/index.html.erb
@@ -17,6 +17,7 @@
       <tr>
         <th>Station name</th>
         <th>Is active</th>
+        <th>Auto Print</th>
         <th>Print copy</th>
         <th>Printer name</th>
         <th>Cut per item</th>
@@ -31,6 +32,7 @@
         <tr>
           <td><%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %></td>
           <td><%= settings_order_queue_station.is_active %></td>
+          <td><%= settings_order_queue_station.auto_print %></td>
           <td><%= settings_order_queue_station.print_copy %></td>
           <td><%= settings_order_queue_station.printer_name %></td>
           <td><%= settings_order_queue_station.cut_per_item %></td>
diff --git a/app/views/settings/order_queue_stations/show.html.erb b/app/views/settings/order_queue_stations/show.html.erb
index 1a80c2c0..e92ed0bb 100644
--- a/app/views/settings/order_queue_stations/show.html.erb
+++ b/app/views/settings/order_queue_stations/show.html.erb
@@ -18,6 +18,11 @@
   <%= @settings_order_queue_station.is_active %>
 </p>
 
+<p>
+  <strong>Auto Print:</strong>
+  <%= @settings_order_queue_station.auto_print %>
+</p>
+
 <p>
   <strong>Processing items:</strong>
   <%= @settings_order_queue_station.processing_items %>