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

add alert_time_min in api/checkin and check for waiter login

Browse Source
This commit is contained in:
phyusin
2017-12-27 10:30:22 +06:30
parent 48fb5563f5
commit 3d235f9d69
6 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/api/check_in_process_controller.rb
View File

@@ -11,7 +11,17 @@ class Api::CheckInProcessController < Api::ApiController
check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") 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") 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 else
render :json => { :status => false, :error_message => "No current booking!" } render :json => { :status => false, :error_message => "No current booking!" }
end end

5
app/controllers/home_controller.rb
View File

@@ -3,7 +3,8 @@ class HomeController < ApplicationController
skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]
def index 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() @login_form = LoginForm.new()
render "layouts/login_dashboard", layout: false render "layouts/login_dashboard", layout: false
end end
@@ -45,7 +46,7 @@ class HomeController < ApplicationController
elsif @employee.role == "manager" elsif @employee.role == "manager"
session[:session_token] = @employee.token_session session[:session_token] = @employee.token_session
redirect_to dashboard_path redirect_to dashboard_path
elsif @employee.role == "supervisor" elsif @employee.role == "supervisor" || @employee.role == "waiter"
session[:session_token] = @employee.token_session session[:session_token] = @employee.token_session
redirect_to origami_root_path redirect_to origami_root_path
elsif @employee.role == "account" elsif @employee.role == "account"

24
app/views/layouts/_header.html.erb
View File

@@ -14,7 +14,9 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <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="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%>"> <a class="navbar-brand" href="<%=dashboard_path%>">
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" /> <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
<span class="navbar-brand-txt">SX Restaurant</span> <span class="navbar-brand-txt">SX Restaurant</span>
@@ -29,16 +31,16 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<%if current_login_employee.role !="waiter" %> <!-- <%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"> <!-- <%end%> -->
<i class="material-icons font-10 logout_icon">exit_to_app</i> <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
<span class="font-18">Logout</span> <i class="material-icons font-10 logout_icon">exit_to_app</i>
</p> <span class="font-18">Logout</span>
<span class="hidden" id="delete_text"> </p>
<h6>Are you sure you want to Logout ?</h6> <span class="hidden" id="delete_text">
<!-- <h6>This action can't be undo. </h6> --> <h6>Are you sure you want to Logout ?</h6>
</span> <!-- <h6>This action can't be undo. </h6> -->
<%end%> </span>
</li> </li>
</ul> </ul>
<!-- NO Need for color Change <!-- NO Need for color Change

25
app/views/layouts/login_dashboard.html.erb
View File

@@ -145,6 +145,31 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </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>
<!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> --> <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
</div> </div>

3
app/views/origami/home/index.html.erb
View File

@@ -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 id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
</button> </button>
<%end%> <%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_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> <button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
<!-- Temporary Disabled --> <!-- Temporary Disabled -->
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button> <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> </div>
</div> </div>

3
app/views/origami/home/show.html.erb
View File

@@ -369,6 +369,7 @@
<%= t("views.btn.back") %> <%= t("views.btn.back") %>
</button> </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> <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> <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 @dining.status != "available" %>
<% if @status_order == 'order' && @status_sale != 'sale' %> <% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -432,7 +433,7 @@
</div> </div>
</div> </div>
</div> </div>
<% end %>
</div> </div>
</div> </div>
</div> </div>