fix for oqs and add instance code to assign order item

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?

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

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.