diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 5b3142e6..3be2f34d 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1434,16 +1434,16 @@ $(function() { row = '
' +'
' - +'
'+ menu_items[field].name +'
' - +"
'+ menu_items[field].name +'
' + +"
" - +"" + +JSON.stringify(menu_items[field].item_sets)+"' data-toggle='modal' data-target='."+data_target+"' style='padding:0px 5px 0px 5px'>" + +"" +add+ '' +'
' +'
' diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index d9b62131..929ffb13 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -56,24 +56,29 @@ section .content{ .nav-tabs .nav-item { border-bottom: 1px solid #fff; margin-left:2px; - + margin-right: -1.555rem; } #ul-navbar{ border-left: 1px solid #54A5AF; border-right: 1px solid #54A5AF; - + padding-right: 0px; } .nav > li > a{ color:#54A5AF; } +.nav-tabs > li > a { + color:#111 !important; +} .nav-tabs { - background-color: #eeeeee; + background-color: #ccc; } .nav-tabs .nav-link { - padding: 0.7286rem 0.2575 + padding: 0.7286rem 0.2575; + border-top-left-radius: 0rem; + border-top-right-radius: 0rem; } .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { - background-color: #fff; + background-color: #a1aade; border-left: 6px solid #111; color:#54A5AF; font-weight: bold; @@ -81,7 +86,7 @@ section .content{ } .sub_category_list{ background:#fff; - margin-top:8px; + margin-top:0px; } .sub_category_list > li{ list-style:none; @@ -274,4 +279,14 @@ i.logout_icon{ .set_add_icon{ display:none; +} + +.nav-tabs > li > a { + color:#111 !important; +} + + +.ls-closed section.content { + margin-left: 15px !important; + margin-right: 15px !important; } \ No newline at end of file diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 1aa2738c..e23da859 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -19,7 +19,7 @@ class HomeController < ApplicationController def index # @employees = Employee.all_emp_except_waiter.order("name asc") - @employees = Employee.all.order("name asc") + @employees = Employee.all.where("is_active = true").order("name asc") @login_form = LoginForm.new() render "layouts/login_dashboard", layout: false end @@ -52,29 +52,33 @@ class HomeController < ApplicationController @employee = Employee.login(@login_form.emp_id, @login_form.password) if @employee != nil - if @employee.role == "administrator" - session[:session_token] = @employee.token_session - redirect_to dashboard_path - elsif @employee.role == "cashier" - session[:session_token] = @employee.token_session - route_by_role(@employee) - elsif @employee.role == "manager" - session[:session_token] = @employee.token_session - redirect_to dashboard_path - 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 - elsif @employee.role == "kitchen" - session[:session_token] = @employee.token_session - redirect_to oqs_root_path + if @employee.is_active + if @employee.role == "administrator" + session[:session_token] = @employee.token_session + redirect_to dashboard_path + elsif @employee.role == "cashier" + session[:session_token] = @employee.token_session + route_by_role(@employee) + elsif @employee.role == "manager" + session[:session_token] = @employee.token_session + redirect_to dashboard_path + 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 + elsif @employee.role == "kitchen" + session[:session_token] = @employee.token_session + redirect_to oqs_root_path + else + render :index + end else - render :index + redirect_to root_path, :notice => "This Employee is not active" end else redirect_to root_path, :notice => "Username and Password doesn't match!" diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb index cefb7b9c..7b558ea1 100755 --- a/app/controllers/settings/employees_controller.rb +++ b/app/controllers/settings/employees_controller.rb @@ -68,6 +68,6 @@ class Settings::EmployeesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def employee_params - params.require(:employee).permit(:name, :role, :emp_id, :password, :image_path) + params.require(:employee).permit(:name, :role, :is_active, :emp_id, :password, :image_path) end end diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 38d30fa8..0ba7f60b 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -5,7 +5,7 @@ <% type = request.path_info.include?('quick_service')%> <% modify_order = request.path_info.include?('modify_order')%> -
+
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb index ad50e9b8..70712c7b 100755 --- a/app/views/settings/employees/_form.html.erb +++ b/app/views/settings/employees/_form.html.erb @@ -7,6 +7,7 @@
<%= f.input :name %> + <%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %> <% if current_user.role == "administrator" %> <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %> <% else %>