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

fixed conflict

Browse Source
This commit is contained in:
Nweni
2019-12-02 17:43:02 +06:30
parent bf337495c1 cac6994ccb
commit de73bf9f7d
118 changed files with 14390 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/transactions/bookings/index.html.erb
View File

@@ -3,7 +3,11 @@
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t :booking %></li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
<%if current_login_employee.role == "foodcourt_cashier" %>
<%= link_to 'Back', foodcourt_food_court_path %>
<% else %>
<%= link_to 'Back', dashboard_path %>
<%end%>
</span>
</ol>
</div>

6
app/views/transactions/orders/index.html.erb
View File

@@ -4,7 +4,11 @@
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("views.right_panel.detail.order") %></li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
<%if current_login_employee.role == "foodcourt_cashier" %>
<%= link_to 'Back', foodcourt_food_court_path %>
<% else %>
<%= link_to 'Back', dashboard_path %>
<%end%>
</span>
</ol>
</div>

6
app/views/transactions/sales/index.html.erb
View File

@@ -3,7 +3,11 @@
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t :sale %></li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
<%if current_login_employee.role == "foodcourt_cashier" %>
<%= link_to 'Back', transactions_bookings_path %>
<% else %>
<%= link_to 'Back', dashboard_path %>
<%end%>
</span>
</ol>
</div>