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

remove conflict data

Browse Source
This commit is contained in:
phyusin
2018-03-05 16:24:45 +06:30
parent 4b311789e1 311bef4411
commit bd06e80b37
111 changed files with 3612 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@
<a href="javascript:void(0);" class="bars"></a>
<a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
<% else %>
<a class="navbar-brand m-0" href="<%=dashboard_path%>">
<a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
<%end%>
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
<span class="navbar-brand-txt">SX Restaurant</span>

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

@@ -124,6 +124,9 @@
<li>
<a href="<%= reports_saleitem_index_path %>">Sale Items</a>
</li>
<li>
<a href="<%= reports_product_sale_index_path %>">Product Sale</a>
</li>
<li>
<a href="<%= reports_receipt_no_index_path %>">Receipt</a>
</li>