diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 4f1c4ae2..488684e7 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -11,7 +11,17 @@ class Api::CheckInProcessController < Api::ApiController
 				check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 				check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 
-				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time }
+				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
+				alert_time_min = 0
+				if !lookup_checkout_time.nil?
+					if lookup_checkout_time[0][0] == 'min'
+					  alert_time_min = (lookup_checkout_time[0][1]).to_i
+					else
+					  alert_time_min = 15
+					end
+				end
+
+				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
 			else 
 				render :json => { :status => false, :error_message => "No current booking!" }
 			end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d3666a60..1ee30bab 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -3,7 +3,8 @@ class HomeController < ApplicationController
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]  
 
   def index
-    @employees = Employee.all_emp_except_waiter.order("name asc")
+    # @employees = Employee.all_emp_except_waiter.order("name asc")
+    @employees = Employee.all.order("name asc")
      @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end
@@ -45,7 +46,7 @@ class HomeController < ApplicationController
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
-      elsif @employee.role == "supervisor"
+      elsif @employee.role == "supervisor" || @employee.role == "waiter"
         session[:session_token] = @employee.token_session
         redirect_to origami_root_path
       elsif @employee.role == "account"
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 41fe9480..a90636f3 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,7 +14,9 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
-            <a href="javascript:void(0);" class="bars"></a>
+            <%if current_login_employee.role !="waiter" %>
+                <a href="javascript:void(0);" class="bars"></a>
+            <%end%>
             <a class="navbar-brand" href="<%=dashboard_path%>">
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
@@ -29,16 +31,16 @@
             </a>
             <ul class="dropdown-menu">
                 <li>
-                    <%if current_login_employee.role !="waiter" %>
-                        <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
-                            <i class="material-icons font-10 logout_icon">exit_to_app</i>
-                            <span class="font-18">Logout</span>
-                        </p>
-                         <span class="hidden" id="delete_text">
-                            <h6>Are you sure you want to Logout ?</h6>
-                            <!-- <h6>This action can't be undo. </h6> -->
-                        </span>
-                    <%end%>
+                    <!-- <%if current_login_employee.role !="waiter" %> -->
+                    <!-- <%end%> -->  
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                        <i class="material-icons font-10 logout_icon">exit_to_app</i>
+                        <span class="font-18">Logout</span>
+                    </p>
+                     <span class="hidden" id="delete_text">
+                        <h6>Are you sure you want to Logout ?</h6>
+                        <!-- <h6>This action can't be undo. </h6> -->
+                    </span>
                 </li>   
             </ul>
             <!-- NO Need for color Change
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 415856b9..f847ae54 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -145,6 +145,31 @@
 		           		<% end %>
            			<% end %>
                 </div>
+
+                <div class="row">
+                    <div class="col-1 col-black">
+                        <span>Waiter</span> 
+                    </div>
+                    <div class="col-11">
+                        <hr />
+                    </div>
+                </div>
+               
+                <div class="row m-b-15">
+                    <% @employees.each do |employee| %>
+                        <%if employee.role == "waiter" %>
+                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
+                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                </form>
+                                <div class="card emp-body">
+                                    <div class="body bg-teal">
+                                    <%=  employee.name%>
+                                </div>
+                                </div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                </div>
             </div>
             <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
         </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 939b969a..46132fff 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -118,12 +118,13 @@
       <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
       </button>
    <%end%>
+   <%if current_login_employee.role != "waiter" %>
    <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
    <button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
    <!-- Temporary Disabled -->
 
    <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
-
+   <%end%>
  </div>
  </div>
  </div>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b77e3b96..4343e230 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -369,6 +369,7 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
+          <% if current_login_employee.role != "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -432,7 +433,7 @@
                     </div>
                 </div>
             </div>
-
+          <% end %>
         </div>
     </div>
 </div>