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

Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-26 09:59:16 +06:30
parent 560ea343a6 6a6c629da4
commit ecc9ab53ec
65 changed files with 1174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,8 @@
<li class="navbar-nav mr-auto dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Reports</a>
<ul class="dropdown-menu">
<li><%= link_to "Daily Sale Report", reports_daily_sale_index_path, :tabindex =>"-1" %></li>
<li><%= link_to "Sales Item Report", reports_sale_item_index_path, :tabindex =>"-1" %></li>
<li><%= link_to "Daily Sale Report", reports_daily_sales_path, :tabindex =>"-1" %></li>
<li><%= link_to "Sales Item Report", reports_sale_items_path, :tabindex =>"-1" %></li>
<li><%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %></li>
</ul>
</li>

11
app/views/layouts/application.html.erb
View File

@@ -18,7 +18,16 @@
<%= render 'layouts/header' %>
<div class="container-fluid">
<% flash.each do |type, message| %>
<div class="alert fade-in">
<%
if type== "warning"
alert = "alert-warning"
elsif type== "notice"
alert = "alert-success"
else
alert = "alert-danger"
end
%>
<div class="alert <%=alert%> fade-in">
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
<%= message %>
</div>