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

remove conflict

Browse Source
This commit is contained in:
phyusin
2018-08-07 11:11:03 +06:30
parent e99e907bc4 2c608920e1
commit 181701be06
5 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,9 +119,11 @@
</li>
<% end %>
<% if can? :manage, OrderReservation %>
<li>
<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
</li>
<% if order_reservation %>
<li>
<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
</li>
<% end %>
<% end %>
<% if can? :menage, Sale %>
<li>
@@ -151,9 +153,11 @@
<li>
<a href="<%= reports_product_sale_index_path %>">Product Sale</a>
</li>
<% if order_reservation %>
<li>
<a href="<%= reports_order_reservation_index_path %>">Order Reservation</a>
<a href="<%= reports_order_reservation_index_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
</li>
<% end %>
<li>
<a href="<%= reports_receipt_no_index_path %>">Receipt</a>
</li>