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

This commit is contained in:
phyusin
2018-08-07 15:05:13 +06:30

View File

@@ -118,20 +118,26 @@
<a href="<%= transactions_surveys_path %>"><%= t("views.right_panel.detail.survey") %></a> <a href="<%= transactions_surveys_path %>"><%= t("views.right_panel.detail.survey") %></a>
</li> </li>
<% end %> <% end %>
<% if can? :manage, OrderReservation && order_reservation %> <% if can? :manage, OrderReservation %>
<li> <% if order_reservation %>
<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a> <li>
</li> <a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
</li>
<% end %>
<% end %> <% end %>
<% if can? :manage, Sale && bank_integration %> <% if can? :manage, Sale %>
<li> <% if bank_integration %>
<a href="<%= transactions_card_sale_trans_path %>"><%= t :cb_payments %></a> <li>
</li> <a href="<%= transactions_card_sale_trans_path %>"><%= t :cb_payments %></a>
</li>
<% end %>
<% end %> <% end %>
<% if can? :manage, Sale && bank_integration %> <% if can? :manage, Sale %>
<li> <% if bank_integration %>
<a href="<%= transactions_card_settle_trans_path %>"><%= t :cb_settlement %></a> <li>
</li> <a href="<%= transactions_card_settle_trans_path %>"><%= t :cb_settlement %></a>
</li>
<% end %>
<% end %> <% end %>
</ul> </ul>
</li> </li>
@@ -186,12 +192,14 @@
<li> <li>
<a href="<%= reports_stock_check_index_path %>">Stock Check</a> <a href="<%= reports_stock_check_index_path %>">Stock Check</a>
</li> </li>
<li> <% if bank_integration %>
<a href="<%= reports_card_sale_tran_index_path %>">CB Payments</a> <li>
</li> <a href="<%= reports_card_sale_tran_index_path %>">CB Payments</a>
<li> </li>
<a href="<%= reports_card_settle_tran_index_path %>">CB Settlement</a> <li>
</li> <a href="<%= reports_card_settle_tran_index_path %>">CB Settlement</a>
</li>
<% end %>
</ul> </ul>
</li> </li>
<%end%> <%end%>