diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 15f5f423..db6dd039 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -59,6 +59,7 @@ class Api::OrdersController <  Api::ApiController
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
+    @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index af843c7e..af04eff5 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -124,7 +124,7 @@ class Oqs::HomeController < BaseOqsController
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id
               left join orders as od ON od.order_id = assigned_order_items.order_id
-              left join order_items as odt ON odt.item_code = assigned_order_items.item_code AND odt.order_id = assigned_order_items.order_id
+              left join order_items as odt ON odt.item_instance_code = assigned_order_items.instance_code AND odt.order_id = assigned_order_items.order_id
               left join customers as cus ON cus.customer_id = od.customer_id
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 7bde1e98..8098dfe9 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -68,6 +68,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
     @order.waiters = current_login_employee.name
+    @order.employee_name = current_login_employee.name
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
         # check booking id is already completed.
diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb
index 34c97c6f..85dd71c7 100755
--- a/app/models/assigned_order_item.rb
+++ b/app/models/assigned_order_item.rb
@@ -7,10 +7,11 @@ class AssignedOrderItem < ApplicationRecord
   belongs_to :order
   belongs_to :order_queue_station
 
-  def self.assigned_order_item (order, item_code, order_queue_station )
+  def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
     assigned_order_item = AssignedOrderItem.new()
     assigned_order_item.order = order
     assigned_order_item.item_code = item_code
+    assigned_order_item.instance_code = instance_code
     assigned_order_item.order_queue_station = order_queue_station
     assigned_order_item.print_status = false
     assigned_order_item.delivery_status = false
@@ -23,7 +24,7 @@ class AssignedOrderItem < ApplicationRecord
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
                               df.name as zone, df.type as table_type, 
-                              odt.order_id, odt.item_code, odt.item_name, 
+                              odt.order_id, odt.item_code, odt.item_instance_code, odt.item_name, 
                               odt.price, odt.qty, odt.item_order_by, odt.options, 
                               cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index d85dffa7..9ed86b85 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -70,7 +70,7 @@ class OrderQueueStation < ApplicationRecord
                 # else
                               
                   if (order_item.price != 0)
-                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) 
+                    AssignedOrderItem.assigned_order_item(order, order_item.item_code, order_item.item_instance_code, oqs) 
                     oqs_order_items.push(order_item)
                   end
                 # end                                           
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 84eb86f8..87e2d6d5 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -605,7 +605,7 @@ end
 
 def self.get_item_query()
       query = Sale.select("acc.title as account_name,mi.account_id, i.item_instance_code as item_code, " +
-                          "(SUM(i.qty * i.unit_price)) as grand_total,SUM(i.qty) as total_item," +
+                          "(i.qty * i.unit_price) as grand_total,(i.qty) as total_item," +
                           " i.unit_price as unit_price,i.product_name as product_name, mc.name as" +
                           " menu_category_name,mc.id as menu_category_id ")
 
@@ -617,7 +617,7 @@ def self.get_item_query()
 
     query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
     query = query.where("i.unit_price > 0")
-    query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id")
+    query = query.group("i.item_instance_code").order("mi.account_id, mi.menu_category_id")
 end
 
 def self.get_by_shift_items(shift_sale_range, shift, from, to, status)