fixed conflict

app/controllers/home_controller.rb

@@ -19,9 +19,11 @@ class HomeController < ApplicationController
 
     if @employee != nil
       session[:session_token] = @employee.token_session
+
       #if cashier => already opening cahshier?
-      
+
       redirect_to origami_root_path
+      route_by_role(@employee)
     else
       render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!"
     end
@@ -76,4 +78,25 @@ class HomeController < ApplicationController
   def settings_home_params
     params.require(:login_form).permit(:emp_id, :password)
   end
+
+  def route_by_role(employee)
+    if employee.role == "administrator"
+      redirect_to dashboard_path
+    elsif employee.role == "cashier"
+      #check if cashier has existing open cashier
+
+      # if !ShiftSale.current_open_shift(employee).nil?
+      #   redirect_to origami_root_path
+      # else
+        redirect_to new_origami_shift_path
+      # end
+    elsif employee.role == "checker"
+      redirect_to oqs_root_path
+    elsif employee.role == "waiter"
+      redirect_to oqs_root_path
+    elsif employee.role == "crm"
+      redirect_to crm_root_path
+
+    end
+  end
 end

app/controllers/origami/cash_mgmt_controller.rb

@@ -0,0 +1,10 @@
+class Origami::CashMgmtController < ApplicationController
+  def index
+  end
+
+  def new
+  end
+
+  def create
+  end
+end

app/controllers/origami/shifts_controller.rb

@@ -0,0 +1,13 @@
+class Origami::ShiftsController < ApplicationController
+  def index
+  end
+
+  def show
+  end
+
+  def new
+  end
+
+  def edit
+  end
+end