git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add sale reason in seed

Browse Source
This commit is contained in:
Yan
2017-06-15 11:12:50 +06:30
parent 2efd6fc410
commit 41572d5360
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/home_controller.rb
View File

@@ -10,7 +10,6 @@ class HomeController < ApplicationController
@login_form.emp_id = params[:login_form][:emp_id]
@login_form.password = params[:login_form][:password]
@employee = Employee.login(@login_form.emp_id, @login_form.password)
<<<<<<< HEAD
if @employee != nil
if @employee.role == "administrator"
@@ -25,17 +24,6 @@ class HomeController < ApplicationController
else
redirect_to origami_root_path, :notice => "Username and Password dosn't match!"
end
=======
if @employee.role == "administrator"
session[:session_token] = @employee.token_session
redirect_to dashboard_path
elsif @employee.role == "cashier"
session[:session_token] = @employee.token_session
redirect_to origami_root_path
else
render :index
end
>>>>>>> 7dffd668eaee6ab82621fd4bae150525ded79df1
end