add link for oqs in origami

app/controllers/home_controller.rb

@@ -46,9 +46,12 @@ class HomeController < ApplicationController
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
-      elsif @employee.role == "supervisor" || @employee.role == "waiter"
+      elsif @employee.role == "supervisor"
         session[:session_token] = @employee.token_session
         redirect_to origami_root_path
+      elsif @employee.role == "waiter"
+        session[:session_token] = @employee.token_session
+        redirect_to origami_dashboard_path
       elsif @employee.role == "account"
         session[:session_token] = @employee.token_session
         redirect_to reports_dailysale_index_path
@@ -160,7 +163,7 @@ class HomeController < ApplicationController
     elsif employee.role == "manager"
       redirect_to dashboard_path
     elsif employee.role == "waiter"
-      redirect_to oqs_root_path
+      redirect_to origami_dashboard_path
     elsif employee.role == "crm"
       redirect_to crm_root_path
     elsif @employee.role == "supervisor"

app/controllers/oqs/edit_controller.rb

@@ -1,6 +1,12 @@
 class Oqs::EditController < BaseOqsController
   def index
   	assigned_item_id = params[:id]
+    @link_type = params[:type]
+    @dining_type = nil
+    if params[:type] != 'oqs'
+      dining = DiningFacility.find_by_id(params[:type])
+      @dining_type = dining.type
+    end
     assigned_item = AssignedOrderItem.find(assigned_item_id)
     @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'");    
   end

app/controllers/origami/dashboard_controller.rb

@@ -55,6 +55,7 @@ class Origami::DashboardController < BaseOrigamiController
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
+    @current_user = current_user
   end
 
   helper_method :shop_detail

app/controllers/origami/home_controller.rb

@@ -62,6 +62,7 @@ class Origami::HomeController < BaseOrigamiController
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
+          @assigned_order_items = Array.new
           if booking.booking_orders.empty?
             @booking = booking
           else
@@ -84,6 +85,10 @@ class Origami::HomeController < BaseOrigamiController
                     item.set_menu_items = arr_instance_item_sets
                   end
                   @order_items.push(item)
+                  assigned_order_items = AssignedOrderItem.find_by_item_code_and_instance_code_and_order_id(item.item_code,item.item_instance_code,item.order_id)
+                  if !assigned_order_items.nil?
+                    @assigned_order_items.push({item.order_items_id => assigned_order_items.assigned_order_item_id})
+                  end
                 end
                 accounts = @customer.tax_profiles
                 puts accounts.to_json

app/controllers/origami/split_bill_controller.rb

@@ -8,6 +8,7 @@ class Origami::SplitBillController < BaseOrigamiController
 		@orders = Array.new
 		@order_items = Array.new
 		@sale_data = Array.new
+		@current_user = current_user
 
 		table_bookings = Booking.where("dining_facility_id = #{dining_id} and sale_id IS NOT NULL")
 		if !table_bookings.nil?

app/controllers/origami/table_invoices_controller.rb

@@ -65,6 +65,8 @@ class Origami::TableInvoicesController < BaseOrigamiController
     if !lookup_spit_bill[0].nil?
       @split_bill = lookup_spit_bill[0][1]
     end
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
   end
 
   #Shop Name in Navbor