diff --git a/README.md b/README.md
index 743c89c6..20e4bfc0 100755
--- a/README.md
+++ b/README.md
@@ -61,6 +61,10 @@ For ReceiptBillA5Pdf
 For ReceiptBillAltName options
 	1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 }
 
+For OrderSetPdf options
+	*** change OrderItemPdf to OrderSetItemPdf and OrderSummaryPdf to OrderSummarySetPdf
+	1) settings/lookups => { type:print_settings, name:OrderSetPdf, value:1 }
+
 For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
   2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 1fe8c561..01372dd3 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -33,6 +33,12 @@ class Oqs::EditController < BaseOqsController
             else
               unique_code="OrderItemPdf"
             end
+          elsif order_item_slim[0] == 'OrderSetPdf' 
+            if order_item_slim[1] == '1'
+              unique_code="OrderSetItemPdf"
+            else
+              unique_code="OrderItemPdf"
+            end
           end
         end
       end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index a25f2531..aaa6b262 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -13,6 +13,12 @@ class Oqs::PrintController < ApplicationController
             else
               unique_code="OrderItemPdf"
             end
+          elsif order_item_slim[0] == 'OrderSetPdf' 
+            if order_item_slim[1] == '1'
+              unique_code="OrderSetItemPdf"
+            else
+              unique_code="OrderItemPdf"
+            end
           end
         end
       end
@@ -55,10 +61,16 @@ class Oqs::PrintController < ApplicationController
             else
               unique_code="OrderSummaryPdf"
             end
+          elsif order_summary_slim[0] == 'OrderSetPdf'
+            if order_summary_slim[1] == '1'
+              unique_code="OrderSummarySetPdf"
+            else
+              unique_code="OrderSummaryPdf"
+            end
           end
         end
       end
-
+      
       assigned_item_id = params[:id]
       table_name = params[:table_name]
       assigned_item = AssignedOrderItem.find(assigned_item_id)    
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index b95377df..2be68fb3 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -112,6 +112,12 @@ class OrderQueueStation < ApplicationRecord
           else
             unique_code="OrderSummaryPdf"
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf'
+          if order_summary_slim[1] == '1'
+            unique_code="OrderSummarySetPdf"
+          else
+            unique_code="OrderSummaryPdf"
+          end
         end
       end
     end  
@@ -140,6 +146,12 @@ class OrderQueueStation < ApplicationRecord
           else
             unique_code="OrderItemPdf"
           end
+        elsif order_item_slim[0] == 'OrderSetPdf' 
+          if order_item_slim[1] == '1'
+            unique_code="OrderSetItemPdf"
+          else
+            unique_code="OrderItemPdf"
+          end
         end
       end
     end  
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 31e85c83..85264737 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -26,6 +26,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             else
               pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
             end
+          elsif order_item_slim[0] == 'OrderSetPdf'
+            if order_item_slim[1] == '1'
+              pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+            else
+              pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+            end
           end
         end
       end
@@ -79,6 +85,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 else
                   pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
                 end
+              elsif order_item_slim[0] == 'OrderSetPdf'
+                if order_item_slim[1] == '1'
+                  pdf = OrderSetItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                else
+                  pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+                end
               end
             end
           end
@@ -106,9 +118,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             else
               pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
             end
+          elsif order_summary_slim[0] == 'OrderSetPdf'
+            if order_summary_slim[1] == '1'
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+            else
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+            end
           end
         end
       end
+
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)        
@@ -152,6 +171,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
                 else
                   pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
                 end
+              elsif order_item_slim[0] == 'OrderSetPdf'
+                if order_item_slim[1] == '1'
+                  pdf = OrderSetItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                else
+                  pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+                end
               end
             end
           end
@@ -182,9 +207,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
             else
               pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
             end
+          elsif order_summary_slim[0] == 'OrderSetPdf'
+            if order_summary_slim[1] == '1'
+              pdf = OrderSummarySetPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+            else
+              pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+            end
           end
         end
       end
+
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)
@@ -203,7 +235,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
   # Query for OQS with status
   def print_query(type, id)
     if type == "order_item"
-      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
+      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
         .joins("left join orders ON orders.order_id = order_items.order_id                
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
@@ -213,7 +245,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         .where("order_items.order_items_id = '#{ id }'")
         .group("order_items.item_code")
     elsif type == "order_summary"                                
-      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
+      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
@@ -224,7 +256,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
         .group("order_items.order_items_id")
     else 
       # order summary for booking
-      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
+      OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name")
         .joins("left join orders ON orders.order_id = order_items.order_id
                 left join booking_orders AS bo ON bo.order_id=order_items.order_id
                 left join bookings AS b ON b.booking_id = bo.booking_id
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index d10dc025..0cf6526f 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -14,6 +14,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderItemPdf.new
           end
+        elsif order_item_slim[0] == 'OrderSetPdf' 
+          if order_item_slim[1] == '1'
+            pdf = OrderSetItemPdf.new
+          else
+            pdf = OrderItemPdf.new
+          end
         end
       end
     end
@@ -36,6 +42,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -59,6 +71,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -82,6 +100,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -105,6 +129,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
@@ -128,6 +158,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
           else
             pdf = OrderSummaryPdf.new
           end
+        elsif order_summary_slim[0] == 'OrderSetPdf' 
+          if order_summary_slim[1] == '1'
+            pdf = OrderSummarySetPdf.new
+          else
+            pdf = OrderSummaryPdf.new
+          end
         end
       end
     end
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
new file mode 100644
index 00000000..1851e93a
--- /dev/null
+++ b/app/pdf/order_set_item_pdf.rb
@@ -0,0 +1,146 @@
+class OrderSetItemPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  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(print_settings,order_set_item, print_status, options, alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90   
+
+    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]  
+
+        self.header_font_size = 11
+        self.item_font_size = 9
+    else
+        self.header_font_size = 12
+        self.item_font_size = 10       
+    end
+     # font "public/fonts/Zawgyi-One.ttf"
+     # font "public/fonts/padauk.ttf"  
+     #font "public/fonts/Chinese.ttf"     
+
+    text "#{ order_set_item.type + '-' + order_set_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 3
+
+    #order_info
+    order_info(order_set_item.order_id, order_set_item.order_by,order_set_item.order_at)
+
+    # order items
+    order_set_items(order_set_item, options, alt_name, print_settings.precision)
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)  
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 2
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 2
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 10
+  end
+
+  # Write Order items to PDF
+  def order_set_items(order_set_item, options, alt_name, precision)
+    y_position = cursor
+
+    #Add Order Item    
+    add_order_set_items(order_set_item, options, alt_name, precision)
+
+    dash(1, :space => 1, :phase => 1)
+    stroke_horizontal_line 0, (self.page_width - self.margin)
+    move_down 5
+  end
+
+  # Add order items under order info
+  def add_order_set_items(order_set_item, options, alt_name, precision)
+    y_position = cursor
+
+    move_down 5
+
+    bounding_box([0,y_position], :width => self.item_width) do
+        text "#{order_set_item.item_code} - #{order_set_item.item_name}", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width) do
+        text "[#{number_with_precision(order_set_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([0,y_position], :width => self.item_width) do
+      text "#{order_set_item.item_code} - #{order_set_item.item_name}", :size => self.item_font_size,:align => :left
+
+    end
+
+    if alt_name
+        if !(order_set_item.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                text "(#{order_set_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+        end
+    end
+
+    #add set menu items
+    if !order_set_item.set_menu_items.empty?
+      set_menu_items = JSON.parse(order_set_item.set_menu_items)
+      if !set_menu_items.empty?
+        # json_item_instance_code = nil
+        set_menu_items.each do |set_item|
+            # if set_item["item_instance_code"] != json_item_instance_code
+                item_instance_name = MenuItemInstance.find_by_item_instance_code(set_item["item_instance_code"]).item_instance_name
+                move_down 2
+                text "#{item_instance_name}", :size => self.item_font_size,:align => :left, :inline_format => true
+            # end
+            # json_item_instance_code = set_item["item_instance_code"]
+        end
+      end
+    end
+
+    if !options.empty?
+        move_down 5
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
+    end
+
+    move_down 5
+
+  end
+
+end
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
new file mode 100644
index 00000000..5a72901c
--- /dev/null
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -0,0 +1,172 @@
+class OrderSummarySetPdf < Prawn::Document
+  include ActionView::Helpers::NumberHelper
+  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(print_settings,order, print_status, order_items = nil,alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    self.margin = 0
+    self.price_width = 40 # No Need for item
+    self.qty_width = 40
+    self.total_width = 40  # No Need for item
+    self.item_width = self.page_width - (self.qty_width - self.margin)
+    self.item_height = 15   
+    self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width)
+    self.label_width=90     
+
+    super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        font "#{print_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+
+        self.header_font_size = 11
+        self.item_font_size = 9 
+    else
+        self.header_font_size = 12
+        self.item_font_size = 10       
+    end
+
+    # font "public/fonts/Zawgyi-One.ttf"
+    # font "public/fonts/padauk.ttf"
+
+    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 5
+
+    #order_info
+    order_info(order[0].order_id, order[0].order_by,order[0].order_at)
+
+    # order items
+    if order_items == nil
+      order_items(order, alt_name, print_settings.precision)
+    else
+      order_items(order_items, alt_name, print_settings.precision)
+    end
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)    
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 5
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 5
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 10
+  end
+
+  # Write Order items to PDF
+  def order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Item", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do
+        text "Qty", :size => self.item_font_size,:align => :left
+    end
+
+    stroke_horizontal_rule
+    move_down 5
+
+    #Add Order Item
+    add_order_items(order_item, alt_name, precision)
+    
+  end
+
+  # Add order items under order info
+  def add_order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    move_down 5
+
+    order_item.each do|odi|
+      # check for item not to show 
+      # if odi.price != 0
+        y_position = cursor
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+
+        bounding_box([self.item_width,y_position], :width => self.qty_width) do
+          text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left
+        end
+
+        bounding_box([0,y_position], :width => self.item_width) do
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
+
+        end
+        
+        if alt_name
+          if !(odi.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+              text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+          end
+              
+        end
+
+        #add set menu items
+        if !odi.set_menu_items.empty?
+          set_menu_items = JSON.parse(odi.set_menu_items)
+          if !set_menu_items.empty?
+            # json_item_instance_code = nil
+            set_menu_items.each do |set_item|
+              # if set_item["item_instance_code"] != json_item_instance_code
+                item_instance_name = MenuItemInstance.find_by_item_instance_code(set_item["item_instance_code"]).item_instance_name
+                move_down 2
+                text "#{item_instance_name}", :size => self.item_font_size,:align => :left, :inline_format => true
+              # end
+              # json_item_instance_code = set_item["item_instance_code"]
+            end
+          end
+        end
+
+        # add option
+        options = odi.options == "[]"? "" : odi.options
+        
+        if options != ""
+          move_down 5
+          
+          y_position = cursor
+          bounding_box([0,y_position], :width => self.item_width) do
+              text "#{options}", :size => self.item_font_size,:align => :left
+          end
+
+          move_down 5
+        end
+
+        move_down 5
+
+        dash(1, :space => 1, :phase => 1)
+        stroke_horizontal_line 0, (self.page_width - self.margin)
+        move_down 5
+      # end
+    end        
+  end
+end