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

fixed cashier shift control & license

Browse Source
This commit is contained in:
NyanLinHtut
2020-06-23 11:36:10 +06:30
parent 276e437a07
commit e7ac530314
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/install/_form.html.erb
View File

@@ -1,4 +1,4 @@
<form action="/activate" method="POST" class="row"> <%= form_tag activate_path, class: "row" do %>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="exampleInputEmail1">Business Name</label> <label for="exampleInputEmail1">Business Name</label>
@@ -27,11 +27,11 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lblDBName">Database Schema</label> <label for="lblDBName">Database Schema</label>
<input type="text" class="form-control" name="db_schema" aria-describedby="db_schema" placeholder="Database Schema"> <input type="text" class="form-control" name="db_schema" aria-describedby="db_schema" placeholder="Database Schema">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lblAdministrator">Database Username</label> <label for="lblAdministrator">Database Username</label>
<input type="text" class="form-control" name="db_user" aria-describedby="db_user" placeholder="Database Username"> <input type="text" class="form-control" name="db_user" aria-describedby="db_user" placeholder="Database Username">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="admin_password">Database Password</label> <label for="admin_password">Database Password</label>
@@ -41,4 +41,4 @@
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<button type="submit" class="btn btn-primary">Activate</button> <button type="submit" class="btn btn-primary">Activate</button>
</div> </div>
</form> <% end %>

12
app/views/layouts/_left_sidebar.html.erb
View File

@@ -51,8 +51,18 @@
<% end %> <% end %>
<% if can? :index, :home %> <% if can? :index, :home %>
<% if current_login_employee.role != "kitchen" %> <% if current_login_employee.role != "kitchen" %>
<% if current_user.role == "cashier"
shift = ShiftSale.current_open_shift(current_user.id)
if !shift.nil?
path = origami_dashboard_path
else
path = new_origami_shift_path
end
else current_user.role == "administrator"
path = origami_dashboard_path
end %>
<li class="menu-up"> <li class="menu-up">
<a href="<%= origami_dashboard_path %>"> <a href="<%= path %>">
<i class="material-icons">monetization_on</i> <i class="material-icons">monetization_on</i>
<span><%= t :origami %></span> <span><%= t :origami %></span>
</a> </a>