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

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into HEAD

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-01-14 18:10:02 +06:30
parent d6e0079314 93928aedd5
commit d41c0fb71f
13 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/home/dashboard.html.erb
View File

@@ -347,7 +347,7 @@
<% end %>
<% end %>
</div>
<% if isMobile.include? "Mobile" %>
<% if isMobile.to_s.include? "Mobile" %>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 ">
<div class="card">

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

@@ -19,8 +19,14 @@
<a href="javascript:void(0);" class="bars"></a>
<% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "account" %>
<a class="navbar-brand mbl_view" href="<%=dashboard_path%>" style="margin-left: 20px;">
<% elsif current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
<% elsif current_login_employee.role == "supervisor" %>
<a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
<% elsif current_login_employee.role == "cashier" || current_login_employee.role == "waiter"%>
<%if ShiftSale.current_open_shift(current_login_employee) %>
<a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
<%else%>
<a class="navbar-brand mbl_view" href="" style="margin-left: 20px;">
<%end%>
<%else%>
<a class="navbar-brand mbl_view" href="" style="margin-left: 20px;">
<% end %>

14
app/views/settings/employees/show.html.erb
View File

@@ -54,12 +54,24 @@
<th><%= t("views.right_panel.detail.employee_photo") %></th>
<td><%= image_tag @employee.image_path, :size => '200x200'%></td>
</tr>
<% if @employee.role == 'application' %>
<tr>
<th><%= t("views.right_panel.detail.employee_app_id") %></th>
<td><%= @employee.app_id %></td>
</tr>
<tr>
<th><%= t("views.right_panel.detail.employee_app_token") %></th>
<td><%= @employee.app_token %></td>
</tr>
<% end %>
<tr>
<th></th>
<td>
<%= link_to t("views.btn.edit"), edit_settings_employee_path(@employee),:class => 'btn btn-primary btn-lg waves-effect' %>
<% if @employee.role == 'application' %>
<%= link_to t("views.btn.change_app_token"), settings_change_app_token_url(id: @employee.id), class: 'btn btn-primary btn-lg waves-effect' %>
<% end %>
<%if @employee.role != "administrator"%>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_employee_path(@employee)%>" data-method="delete">
<%= t("views.btn.delete") %>
</button>