fixed conflict

app/controllers/home_controller.rb

@@ -78,6 +78,9 @@ class HomeController < ApplicationController
         elsif @employee.role == "kitchen"
           session[:session_token] = @employee.token_session
           redirect_to oqs_root_path
+        elsif @employee.role == "foodcourt_cashier"
+          session[:session_token] = @employee.token_session
+          route_by_role(@employee)
         else
            render :index
         end
@@ -216,6 +219,14 @@ class HomeController < ApplicationController
         redirect_to origami_dashboard_path
     elsif employee.role == "account"
         redirect_to reports_dailysale_index_path
+    elsif employee.role == "foodcourt_cashier"
+      #check if cashier has existing open cashier
+      shift = ShiftSale.current_open_shift(employee)
+      if !shift.nil?
+        redirect_to foodcourt_food_court_path
+      else
+        redirect_to new_foodcourt_shift_path
+      end
     end
   end